build fixesgnome-panel-2_20_0_1-4_fc9

2 files changed, 54 insertions, 4 deletions

diff --git a/gnome-panel.spec b/gnome-panel.spec
index c79aceb..96ad150 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -32,6 +32,7 @@ Source2: intlclock-1.0.tar.gz
 Patch98: timezone-changes.patch
 Patch99: intlclock-changes-20071005.patch
 Patch100: dont-build-clock.patch
+Patch101: intlclock-build-fixes.patch
 
 Source3: redhat-panel-default-setup.entries
 Source4: gnome-compiler-flags.m4
@@ -88,7 +89,11 @@ BuildRequires: evolution-data-server-devel >= %{evolution_data_server_version}
 BuildRequires: ORBit2-devel >= %{orbit_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 %endif
+
+# for intlclock
 BuildRequires: PolicyKit-devel
+BuildRequires: gnome-applets-devel 
+BuildRequires: librsvg2-devel
 
 Patch0: gnome-panel-2.19.5-vendor.patch
 Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
@@ -159,6 +164,7 @@ popd
 %patch11 -p1 -b .applet-error
 
 %patch100 -p1 -b .dont-build-clock
+%patch101 -p1 -b .intlclock-build-fixes
 
 . %{SOURCE6}
 
@@ -200,6 +206,10 @@ popd
 %install
 rm -rf $RPM_BUILD_ROOT
 
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+make DESTDIR=$RPM_BUILD_ROOT install
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
 pushd timezone
 make DESTDIR=$RPM_BUILD_ROOT install
 popd
@@ -208,10 +218,6 @@ pushd intlclock-1.0
 make DESTDIR=$RPM_BUILD_ROOT install
 popd
 
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make DESTDIR=$RPM_BUILD_ROOT install
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
 #
 # Create pager and tasklist schemas for compatibility with older
 # configurations which reference the old schema names
diff --git a/intlclock-build-fixes.patch b/intlclock-build-fixes.patch
new file mode 100644
index 0000000..9c6f278
--- /dev/null
+++ b/intlclock-build-fixes.patch
@@ -0,0 +1,44 @@
+diff -up gnome-panel-2.20.0.1/intlclock-1.0/src/Makefile.am.intlclock-build-fixes gnome-panel-2.20.0.1/intlclock-1.0/src/Makefile.am
+--- gnome-panel-2.20.0.1/intlclock-1.0/src/Makefile.am.intlclock-build-fixes	2007-10-05 11:43:24.000000000 -0400
++++ gnome-panel-2.20.0.1/intlclock-1.0/src/Makefile.am	2007-10-05 11:46:42.000000000 -0400
+@@ -1,6 +1,8 @@
+ ## We put the libpanel-applet dir here for when we build the applet
+ ## inside the gnome-panel source tree
+ INCLUDES =							\
++	-I$(srcdir)/../../libpanel-applet			\
++	-I$(top_builddir)/libpanel-applet			\
+ 	$(INTLCLOCK_CFLAGS)					\
+ 	-DGNOMELOCALEDIR=\"$(prefix)/$(DATADIRNAME)/locale\"	\
+ 	-DEVOLUTION_TEXTDOMAIN=\"evolution-2.12\"		\
+@@ -28,7 +30,6 @@ intlclock-marshallers.c: intlclock-marsh
+ intlclock-marshallers.h: intlclock-marshallers.list
+ 	glib-genmarshal --prefix _intlclock_marshal --header $< > $@
+ 
+-noinst_PROGRAMS  = intlclock-standalone
+ libexec_PROGRAMS = intlclock-applet
+ 
+ COMMON_SOURCES =				\
+@@ -75,7 +76,10 @@ intlclock_standalone_SOURCES =			\
+ 	$(COMMON_SOURCES)			\
+ 	standalone.c
+ 
+-intlclock_applet_LDADD     = $(INTLCLOCK_LIBS)
++intlclock_applet_LDADD = 				\
++	../../libpanel-applet/libpanel-applet-2.la	\	
++	$(INTLCLOCK_LIBS)
++
+ intlclock_standalone_LDADD = $(INTLCLOCK_LIBS)
+ 
+ EXTRA_DIST = intlclock-marshallers.list
+diff -up gnome-panel-2.20.0.1/intlclock-1.0/configure.in.intlclock-build-fixes gnome-panel-2.20.0.1/intlclock-1.0/configure.in
+--- gnome-panel-2.20.0.1/intlclock-1.0/configure.in.intlclock-build-fixes	2007-10-05 11:43:24.000000000 -0400
++++ gnome-panel-2.20.0.1/intlclock-1.0/configure.in	2007-10-05 11:43:24.000000000 -0400
+@@ -59,7 +59,7 @@ if test -n "$LIBECAL_REQUIREMENT"; then
+ fi
+ AM_CONDITIONAL(HAVE_LIBECAL, test -n "$LIBECAL_REQUIREMENT")
+ 
+-PKG_CHECK_MODULES(INTLCLOCK, [ glib-2.0 gobject-2.0 gtk+-2.0 gdk-2.0 librsvg-2.0 libpanelapplet-2.0 libgnome-2.0 gconf-2.0 $LIBECAL_REQUIREMENT dbus-glib-1 gweather libxml-2.0 polkit polkit-dbus ])
++PKG_CHECK_MODULES(INTLCLOCK, [ glib-2.0 gobject-2.0 gtk+-2.0 gdk-2.0 librsvg-2.0 libgnome-2.0 libgnomeui-2.0 libbonobo-2.0 gconf-2.0 $LIBECAL_REQUIREMENT dbus-glib-1 gweather libxml-2.0 polkit polkit-dbus ])
+ 
+ AC_SUBST(INTLCLOCK_CFLAGS)
+ AC_SUBST(INTLCLOCK_LIBS)