diff options
author | Matthias Clasen <mclasen@redhat.com> | 2010-09-01 14:10:19 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2010-09-01 14:10:19 -0400 |
commit | 592584c1c5f9ac907e732742a1898a9fb38098ec (patch) | |
tree | a492c8a46f3a97fa7c8d0514f5d6e26ff06233e0 | |
parent | 0850308ebdd7606e5682f4a6a72fd1b6485f7834 (diff) | |
download | gnome-applets-592584c1c5f9ac907e732742a1898a9fb38098ec.tar.gz gnome-applets-592584c1c5f9ac907e732742a1898a9fb38098ec.tar.xz gnome-applets-592584c1c5f9ac907e732742a1898a9fb38098ec.zip |
try to get this damn thing to build
-rw-r--r-- | gnome-applets-libs.patch | 13 | ||||
-rw-r--r-- | gnome-applets.spec | 4 | ||||
-rw-r--r-- | modemlights-libgnome.patch | 38 |
3 files changed, 33 insertions, 22 deletions
diff --git a/gnome-applets-libs.patch b/gnome-applets-libs.patch index b4297ce..b2b3347 100644 --- a/gnome-applets-libs.patch +++ b/gnome-applets-libs.patch @@ -1,16 +1,3 @@ -diff -up gnome-applets-2.31.90.1/cpufreq/src/Makefile.am.libs gnome-applets-2.31.90.1/cpufreq/src/Makefile.am ---- gnome-applets-2.31.90.1/cpufreq/src/Makefile.am.libs 2010-08-18 15:59:16.000000000 -0400 -+++ gnome-applets-2.31.90.1/cpufreq/src/Makefile.am 2010-08-19 20:02:09.776849002 -0400 -@@ -31,7 +31,8 @@ cpufreq_applet_SOURCES = \ - cpufreq_applet_LDADD = \ - $(GNOME_APPLETS3_LIBS) \ - $(LIBGLADE_LIBS) \ -- $(LIBCPUFREQ_LIBS) -+ $(LIBCPUFREQ_LIBS) \ -+ $(DBUS_LIBS) - - - diff -up gnome-applets-2.31.90.1/geyes/Makefile.am.libs gnome-applets-2.31.90.1/geyes/Makefile.am --- gnome-applets-2.31.90.1/geyes/Makefile.am.libs 2010-08-18 15:59:16.000000000 -0400 +++ gnome-applets-2.31.90.1/geyes/Makefile.am 2010-08-19 20:02:37.640849001 -0400 diff --git a/gnome-applets.spec b/gnome-applets.spec index f9a84ee..878ac1b 100644 --- a/gnome-applets.spec +++ b/gnome-applets.spec @@ -57,6 +57,7 @@ Patch42: stickynotes-null.patch # https://bugzilla.gnome.org/show_bug.cgi?id=609945 Patch50: gnome-applets-libs.patch +Patch51: pymod-check.patch BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk2-devel >= %{gtk2_version} @@ -142,6 +143,7 @@ tar xjf %{SOURCE2} %patch34 -p1 -b .ppp-includes %patch35 -p1 -b .modemlights-libgnome %patch50 -p1 -b .libs +%patch51 -p1 -b .pymod autoreconf -i -f @@ -309,6 +311,8 @@ fi %{_sysconfdir}/dbus-1/system.d/org.gnome.CPUFreqSelector.conf %{_datadir}/polkit-1/actions/org.gnome.cpufreqselector.policy %{_datadir}/dbus-1/system-services/org.gnome.CPUFreqSelector.service +%{_datadir}/dbus-1/services/* +%{_datadir}/gnome-panel/applets/* %changelog diff --git a/modemlights-libgnome.patch b/modemlights-libgnome.patch index 24a63f8..956ed67 100644 --- a/modemlights-libgnome.patch +++ b/modemlights-libgnome.patch @@ -1,6 +1,6 @@ -diff -up gnome-applets-2.31.90.1/configure.in.modemlights-libgnome gnome-applets-2.31.90.1/configure.in ---- gnome-applets-2.31.90.1/configure.in.modemlights-libgnome 2010-08-18 18:30:01.000000000 -0400 -+++ gnome-applets-2.31.90.1/configure.in 2010-08-19 23:38:59.508849002 -0400 +diff -up gnome-applets-2.31.91/configure.in.modemlights-libgnome gnome-applets-2.31.91/configure.in +--- gnome-applets-2.31.91/configure.in.modemlights-libgnome 2010-08-30 06:11:48.000000000 -0400 ++++ gnome-applets-2.31.91/configure.in 2010-09-01 10:16:20.595940001 -0400 @@ -126,6 +126,11 @@ PKG_CHECK_MODULES(GNOME_APPLETS3, libpan AC_SUBST(GNOME_APPLETS3_CFLAGS) AC_SUBST(GNOME_APPLETS3_LIBS) @@ -13,9 +13,29 @@ diff -up gnome-applets-2.31.90.1/configure.in.modemlights-libgnome gnome-applets dnl -- check for gnome-desktop (required) ------------------------------------- PKG_CHECK_MODULES(GNOMEDESKTOP, gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) AC_SUBST(GNOMEDESKTOP_CFLAGS) -diff -up gnome-applets-2.31.90.1/modemlights/Makefile.am.modemlights-libgnome gnome-applets-2.31.90.1/modemlights/Makefile.am ---- gnome-applets-2.31.90.1/modemlights/Makefile.am.modemlights-libgnome 2004-11-04 06:44:55.000000000 -0500 -+++ gnome-applets-2.31.90.1/modemlights/Makefile.am 2010-08-19 23:38:59.509849002 -0400 +@@ -495,8 +500,7 @@ dnl AC_DEFINE_UNQUOTED(STB_SCRIPTS_DIR + dnl AC_DEFINE_UNQUOTED(SU_PATH, "${SU_TOOL}", [su executable path]) + dnl BUILD_MODEM_LIGHTS=yes + dnl else +- AC_MSG_WARN([*** modemlights applet will not be built ***]) +- BUILD_MODEM_LIGHTS=no ++ BUILD_MODEM_LIGHTS=yes + dnl fi + + AM_CONDITIONAL(APPLET_MODEMLIGHTS, test "x$BUILD_MODEM_LIGHTS" = "xyes") +@@ -688,6 +692,9 @@ mini-commander/help/Makefile + drivemount/Makefile + drivemount/help/Makefile + modemlights/Makefile ++modemlights/docs/Makefile ++modemlights/docs/C/Makefile ++modemlights/docs/eu/Makefile + multiload/Makefile + multiload/docs/Makefile + gkb-new/Makefile +diff -up gnome-applets-2.31.91/modemlights/Makefile.am.modemlights-libgnome gnome-applets-2.31.91/modemlights/Makefile.am +--- gnome-applets-2.31.91/modemlights/Makefile.am.modemlights-libgnome 2004-11-04 06:44:55.000000000 -0500 ++++ gnome-applets-2.31.91/modemlights/Makefile.am 2010-09-01 10:10:27.119940001 -0400 @@ -2,6 +2,7 @@ SUBDIRS = docs INCLUDES = -I. -I$(srcdir) \ @@ -32,9 +52,9 @@ diff -up gnome-applets-2.31.90.1/modemlights/Makefile.am.modemlights-libgnome gn $(GNOME_APPLETS_LIBS) uidir = $(datadir)/gnome-2.0/ui -diff -up gnome-applets-2.31.90.1/po/POTFILES.in.modemlights-libgnome gnome-applets-2.31.90.1/po/POTFILES.in ---- gnome-applets-2.31.90.1/po/POTFILES.in.modemlights-libgnome 2010-08-18 18:09:58.000000000 -0400 -+++ gnome-applets-2.31.90.1/po/POTFILES.in 2010-08-19 23:41:28.694849003 -0400 +diff -up gnome-applets-2.31.91/po/POTFILES.in.modemlights-libgnome gnome-applets-2.31.91/po/POTFILES.in +--- gnome-applets-2.31.91/po/POTFILES.in.modemlights-libgnome 2010-08-30 06:11:15.000000000 -0400 ++++ gnome-applets-2.31.91/po/POTFILES.in 2010-09-01 10:10:27.181940002 -0400 @@ -72,7 +72,7 @@ mixer/applet.c mixer/dock.c mixer/load.c |