rpms/gnome-panel/devel intlclock-build-fixes.patch, NONE, 1.1 gnome-panel.spec, 1.226, 1.227

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21591

Modified Files:
	gnome-panel.spec 
Added Files:
	intlclock-build-fixes.patch 
Log Message:
build fixes


intlclock-build-fixes.patch:

--- NEW FILE intlclock-build-fixes.patch ---
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)


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- gnome-panel.spec	5 Oct 2007 14:40:26 -0000	1.226
+++ gnome-panel.spec	5 Oct 2007 15:54:10 -0000	1.227
@@ -32,6 +32,7 @@
 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: 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 @@
 %patch11 -p1 -b .applet-error
 
 %patch100 -p1 -b .dont-build-clock
+%patch101 -p1 -b .intlclock-build-fixes
 
 . %{SOURCE6}
 
@@ -200,6 +206,10 @@
 %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 @@
 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