summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@fedoraproject.org>2007-11-13 16:45:43 +0000
committerMatthias Clasen <mclasen@fedoraproject.org>2007-11-13 16:45:43 +0000
commitf4ea61d92653f88dff76ac6d05dbaed1a696299f (patch)
tree5b44eddf40dd91e71dcbba65e12dd2eef4d5efa4
parentb4dd6b928d4d4c8783e79fb0eb27da2bfdf8d90d (diff)
downloadgnome-panel-f4ea61d92653f88dff76ac6d05dbaed1a696299f.tar.gz
gnome-panel-f4ea61d92653f88dff76ac6d05dbaed1a696299f.tar.xz
gnome-panel-f4ea61d92653f88dff76ac6d05dbaed1a696299f.zip
Build without intlclock for bootstrappinggnome-panel-2_20_1-5_fc9
-rw-r--r--gnome-panel.spec10
1 files changed, 10 insertions, 0 deletions
diff --git a/gnome-panel.spec b/gnome-panel.spec
index f0fe855..71ff64f 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -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: ORBit2-devel >= %{orbit_version}
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 @@ autoconf
make
+%if %{build_intlclock}
pushd timezone
make
popd
@@ -212,6 +216,7 @@ autoconf
%configure
make
popd
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -220,6 +225,7 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
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 @@ popd
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 @@ fi
%{_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 @@ fi
%{_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 @@ fi
%changelog
* Tue Nov 13 2007 Matthias Clasen <mclasen@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@redhat.com> - 2.20.1-4
- Intlclock: make default units work correctly