rpms/gnome-panel/devel gnome-panel.spec,1.240,1.241

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	gnome-panel.spec 
Log Message:
Build without intlclock for bootstrapping



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- gnome-panel.spec	13 Nov 2007 16:31:31 -0000	1.240
+++ gnome-panel.spec	13 Nov 2007 16:45:43 -0000	1.241
@@ -18,6 +18,7 @@
 %define gnome_doc_utils_version 0.3.2
 
 %define use_evolution_data_server 1
+%define build_intlclock 0
 
 Summary: GNOME panel
 Name: gnome-panel
@@ -89,11 +90,13 @@
 BuildRequires: dbus-devel >= %{dbus_version}
 %endif
 
+%if %{build_intlclock}
 # for intlclock
 BuildRequires: PolicyKit-devel
 BuildRequires: gnome-applets-devel 
 BuildRequires: librsvg2-devel
 BuildRequires: NetworkManager-devel
+%endif
 
 Patch0: gnome-panel-2.19.5-vendor.patch
 Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
@@ -199,6 +202,7 @@
 
 make
 
+%if %{build_intlclock}
 pushd timezone
 make
 popd
@@ -212,6 +216,7 @@
 %configure
 make
 popd
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -220,6 +225,7 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
+%if %{build_intlclock}
 pushd timezone
 make DESTDIR=$RPM_BUILD_ROOT install
 popd
@@ -227,6 +233,7 @@
 pushd intlclock-1.0
 make DESTDIR=$RPM_BUILD_ROOT install
 popd
+%endif
 
 #
 # Create pager and tasklist schemas for compatibility with older
@@ -365,6 +372,7 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_sysconfdir}/gconf/schemas/*.entries
 
+%if %{build_intlclock}
 # intlclock files
 %{_sysconfdir}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
 %{_datadir}/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
@@ -375,6 +383,7 @@
 %{_bindir}/gnome-clock-applet-mechanism-gtk
 %{_sysconfdir}/gconf/schemas/intlclock.schemas
 %{_libdir}/bonobo/servers/GNOME_IntlClockApplet_Factory.server
+%endif
 
 %files libs
 %{_libdir}/*.so.*
@@ -389,6 +398,7 @@
 %changelog
 * Tue Nov 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.1-5
 - Split off a libs subpackage to break a cyclic dependency
+- Build without intlclock for bootstrapping purposes
 
 * Mon Oct 29 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.1-4
 - Intlclock: make default units work correctly