[gnome-applets/f14/master] try to get this damn thing to build

Matthias Clasen mclasen at fedoraproject.org
Wed Sep 1 18:37:17 UTC 2010 

commit 801b5a601906b6e333e1bd6daa79235ae53a7a41
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Sep 1 14:35:56 2010 -0400

    try to get this damn thing to build

 .gitignore                 |    8 ++------
 gnome-applets-libs.patch   |   13 -------------
 gnome-applets.spec         |    4 ++++
 modemlights-libgnome.patch |   38 +++++++++++++++++++++++++++++---------
 pymod-check.patch          |   24 ++++++++++++++++++++++++
 sources                    |    4 ----
 6 files changed, 59 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 85fdce7..384b172 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,3 @@
-gnome-applets-2.31.5.tar.bz2
-<<<<<<< HEAD
-=======
 gnome-applets-2.31.6.tar.bz2
-/gnome-applets-2.31.90.1.tar.bz2
-/gnome-applets-2.31.91.tar.bz2
->>>>>>> 957d84f... 2.31.91
+gnome-applets-2.31.90.1.tar.bz2
+gnome-applets-2.31.91.tar.bz2
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 ca501bb..a9c25eb 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
diff --git a/pymod-check.patch b/pymod-check.patch
new file mode 100644
index 0000000..26721f2
--- /dev/null
+++ b/pymod-check.patch
@@ -0,0 +1,24 @@
+diff -up gnome-applets-2.31.91/m4/python.m4.pymod gnome-applets-2.31.91/m4/python.m4
+--- gnome-applets-2.31.91/m4/python.m4.pymod	2010-09-01 11:45:44.141940000 -0400
++++ gnome-applets-2.31.91/m4/python.m4	2010-09-01 11:45:59.292940002 -0400
+@@ -14,6 +14,7 @@ except ImportError:
+         sys.exit(1)
+ except:
+         sys.exit(0)
++
+ sys.exit(0)"], [prog="
+ import $1
+ $1.$2"])
+diff -up gnome-applets-2.31.91/configure.in.gnomeapplet gnome-applets-2.31.91/configure.in
+--- gnome-applets-2.31.91/configure.in.gnomeapplet	2010-09-01 13:40:56.170939997 -0400
++++ gnome-applets-2.31.91/configure.in	2010-09-01 13:44:44.248940002 -0400
+@@ -564,8 +564,7 @@ dnl *** invest-applet specific checks   
+ dnl ***************************************************************************
+ 
+ if test "x$HAVE_PYGTK" = "xyes" -a "x$HAVE_PYHDRS" = "xyes"; then
+-	AM_CHECK_PYMOD(gnomeapplet,,
+-			BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no")
++	BUILD_INVEST_APPLET="yes"
+ else
+ 	BUILD_INVEST_APPLET="no"
+ fi
diff --git a/sources b/sources
index 5801b1a..dc26bbf 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2
-8352ade6d8df071cd356b0bc51e29229  gnome-applets-2.31.6.tar.bz2
-=======
 43bce1a45b32ae8e7d00cd8ed8df2ec1  gnome-applets-2.31.91.tar.bz2
->>>>>>> 957d84f... 2.31.91

More information about the scm-commits mailing list