rpms/gnome-panel/devel .cvsignore, 1.67, 1.68 gnome-panel.spec, 1.245, 1.246 sources, 1.70, 1.71 dont-build-clock.patch, 1.1, NONE gnome-panel-2.19.5-launcher-tooltip.patch, 1.1, NONE gweather-api.patch, 1.1, NONE intlclock-build-fixes.patch, 1.1, NONE power-management.patch, 1.1, NONE timezone-changes.patch, 1.1, NONE

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	.cvsignore gnome-panel.spec sources 
Removed Files:
	dont-build-clock.patch 
	gnome-panel-2.19.5-launcher-tooltip.patch gweather-api.patch 
	intlclock-build-fixes.patch power-management.patch 
	timezone-changes.patch 
Log Message:
2.21.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	27 Nov 2007 06:18:12 -0000	1.67
+++ .cvsignore	16 Jan 2008 06:00:57 -0000	1.68
@@ -1 +1 @@
-gnome-panel-2.20.2.tar.bz2
+gnome-panel-2.21.5.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- gnome-panel.spec	13 Dec 2007 14:38:22 -0000	1.245
+++ gnome-panel.spec	16 Jan 2008 06:00:57 -0000	1.246
@@ -18,22 +18,13 @@
 %define gnome_doc_utils_version 0.3.2
 
 %define use_evolution_data_server 1
-%define build_intlclock 1
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.20.2
-Release: 2%{?dist} 
+Version: 2.21.5
+Release: 1%{?dist} 
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-panel/2.20/%{name}-%{version}.tar.bz2
-# we are upstream for this
-Source1: timezone.tar.gz
-# Novell intlclock, I don't think this has a canonical upstream location
-Source2: intlclock-20071113.tar.gz
-Patch98: timezone-changes.patch
-Patch100: dont-build-clock.patch
-Patch101: intlclock-build-fixes.patch
-Patch102: gweather-api.patch
+Source0: http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar.bz2
 
 Source3: redhat-panel-default-setup.entries
 Source4: gnome-compiler-flags.m4
@@ -90,14 +81,10 @@
 BuildRequires: ORBit2-devel >= %{orbit_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 %endif
-
-%if %{build_intlclock}
-# for intlclock
 BuildRequires: PolicyKit-devel
-BuildRequires: gnome-applets-devel 
+BuildRequires: libgweather-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
@@ -157,12 +144,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-tar xzf %{SOURCE1}
-pushd timezone
-%patch98 -p1 -b .timezone-changes
-popd
-
-tar xzf %{SOURCE2}
 
 %patch0 -p1 -b .vendor
 %patch1 -p1 -b .speak-to-us-ye-old-wise-fish
@@ -177,10 +158,6 @@
 %patch11 -p1 -b .applet-error
 %patch12 -p1 -b .more-sharp-icons
 
-%patch100 -p1 -b .dont-build-clock
-%patch101 -p1 -b .intlclock-build-fixes
-%patch102 -p1 -b .gweather-api
-
 . %{SOURCE6}
 
 cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
@@ -204,22 +181,6 @@
 
 make
 
-%if %{build_intlclock}
-pushd timezone
-make
-popd
-
-pushd intlclock-1.0
-intltoolize --force --copy
-aclocal
-automake --add-missing
-autoheader
-autoconf
-%configure
-make
-popd
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -227,16 +188,6 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-%if %{build_intlclock}
-pushd timezone
-make DESTDIR=$RPM_BUILD_ROOT install
-popd
-
-pushd intlclock-1.0
-make DESTDIR=$RPM_BUILD_ROOT install
-popd
-%endif
-
 #
 # Create pager and tasklist schemas for compatibility with older
 # configurations which reference the old schema names
@@ -286,7 +237,7 @@
 # Install the schemas
 #
 gconftool-2 --makefile-install-rule \
-	%{_sysconfdir}/gconf/schemas/intlclock.schemas \
+	%{_sysconfdir}/gconf/schemas/clock.schemas \
 	%{_sysconfdir}/gconf/schemas/fish.schemas \
 	%{_sysconfdir}/gconf/schemas/pager.schemas \
 	%{_sysconfdir}/gconf/schemas/panel-compatibility.schemas \
@@ -311,7 +262,7 @@
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule \
-	%{_sysconfdir}/gconf/schemas/intlclock.schemas \
+	%{_sysconfdir}/gconf/schemas/clock.schemas \
 	%{_sysconfdir}/gconf/schemas/fish.schemas \
 	%{_sysconfdir}/gconf/schemas/pager.schemas \
 	%{_sysconfdir}/gconf/schemas/panel-compatibility.schemas \
@@ -329,7 +280,7 @@
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule \
-	%{_sysconfdir}/gconf/schemas/intlclock.schemas \
+	%{_sysconfdir}/gconf/schemas/clock.schemas \
 	%{_sysconfdir}/gconf/schemas/fish.schemas \
 	%{_sysconfdir}/gconf/schemas/pager.schemas \
 	%{_sysconfdir}/gconf/schemas/panel-compatibility.schemas \
@@ -374,18 +325,10 @@
 %{_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
 %{_datadir}/PolicyKit/policy/gnome-clock-applet-mechanism.policy
-%{_datadir}/intlclock
-%{_libexecdir}/intlclock-applet
-%{_libexecdir}/gnome-clock-applet-mechanism
-%{_bindir}/gnome-clock-applet-mechanism-gtk
-%{_sysconfdir}/gconf/schemas/intlclock.schemas
-%{_libdir}/bonobo/servers/GNOME_IntlClockApplet_Factory.server
-%endif
+%{_datadir}/clock
 
 %files libs
 %{_libdir}/*.so.*
@@ -398,6 +341,10 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Jan 16 2008 Matthias Clasen <mclasen at redhat.com> - 2.21.5-1
+- Update to 2.21.5
+- Drop separate intlclock
+
 * Thu Dec 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.2-2
 - Adapt to libgweather api changes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	27 Nov 2007 06:18:12 -0000	1.70
+++ sources	16 Jan 2008 06:00:57 -0000	1.71
@@ -1,3 +1 @@
-400924a82c03ec04f7842348625e1f4a  gnome-panel-2.20.2.tar.bz2
-7c313b9d3d3d659af4abf8119b5ecab7  intlclock-20071113.tar.gz
-717506485ee954b1d7ac6d2bfb3bb4f9  timezone.tar.gz
+967f0fc60b069921095ee642fcea1f55  gnome-panel-2.21.5.tar.bz2


--- dont-build-clock.patch DELETED ---


--- gnome-panel-2.19.5-launcher-tooltip.patch DELETED ---


--- gweather-api.patch DELETED ---


--- intlclock-build-fixes.patch DELETED ---


--- power-management.patch DELETED ---


--- timezone-changes.patch DELETED ---