rpms/gnome-applets/devel gnome-applets.spec,1.201,1.202

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32648

Modified Files:
	gnome-applets.spec 
Log Message:
spec file cleanup



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- gnome-applets.spec	7 Dec 2006 19:26:51 -0000	1.201
+++ gnome-applets.spec	9 Dec 2006 05:57:54 -0000	1.202
@@ -31,14 +31,18 @@
 %define build_stickynotes 1
 
 Summary:        Small applications for the GNOME panel
-Name:     	gnome-applets
-Version: 	2.16.2
-Release: 3%{?dist}
+Name:		gnome-applets
+Version:	2.16.2
+Release: 	4%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
-Source: 	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
+URL:		http://www.gnome.org/
+Source: 	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.16/%{name}-%{version}.tar.bz2
 Source1:	gnome-applets-2.9.3.1-modemlights.tar.bz2
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Patch0:		gnome-applets-2.15.2-use-old-modemlights.patch
 Patch2:		gnome-applets-2.10.1-use-builtin-apm.patch
 Patch3:		gnome-applets-2.3.6-ppp-command.patch
@@ -61,12 +65,7 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=382774 
 Patch28: gnome-applets-2.16.2-trash-screen.patch
 
-URL:		http://www.gnome.org/
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-
-Prereq:         scrollkeeper >= 0.1.4
-Prereq:         gtk2 >= %{gtk2_version}
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -93,7 +92,6 @@
 BuildRequires:  gnome-python2-devel >= %{gnome_python_version}
 BuildRequires:  gnome-python2-applet
 BuildRequires:  gucharmap-devel
-
 BuildRequires:  dbus-devel >= %{dbus_version}
 BuildRequires:  dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires:  xorg-x11-proto-devel
@@ -108,11 +106,18 @@
 Requires:	libxklavier >= %{libxklavier_version}
 Requires:	gstreamer-plugins-base >= %{gstreamer_plugins_version}
 Requires:	gstreamer-plugins-good >= %{gstreamer_plugins_version}
-Requires(post): GConf2 >= %{gconf_version}
+
+Requires(pre): GConf2 >= %{gconf_version}
 Requires(pre): GConf2 >= %{gconf_version}
+
 Requires(preun): GConf2 >= %{gconf_version}
+
+Requires(post): scrollkeeper >= 0.1.4
+Requires(post): GConf2 >= %{gconf_version}
 Requires(post): scrollkeeper
 
+Requires(postun): scrollkeeper
+
 # For wireless-applet backwards compat
 Requires:       gnome-netstatus >= 2.8.0-2
 
@@ -207,7 +212,7 @@
 
 %post
 /sbin/ldconfig
-scrollkeeper-update
+scrollkeeper-update -q
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
@@ -276,6 +281,7 @@
 
 %postun 
 /sbin/ldconfig
+scrollkeeper-update -q
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
@@ -338,6 +344,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Sat Dec  9 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.16.2-4
+- Small spec file cleanups
+
 * Thu Dec  7 2006 Jeremy Katz <katzj at redhat.com> - 1:2.16.2-3
 - rebuild for python 2.5
 
@@ -643,8 +652,8 @@
 - actually build the old modemlights that were added in 2.10.0-4
 
 * Tue Apr  5 2005 Ray Strode <rstrode at redhat.com> 1:2.10.0-5
-- Don't use %postun -p optimization now that we do more than
-  just /sbin/ldconfig in %postun (bug 152236)
+- Don't use %%postun -p optimization now that we do more than
+  just /sbin/ldconfig in %%postun (bug 152236)
 
 * Mon Apr  4 2005 Ray Strode <rstrode at redhat.com> 1:2.10.0-4
 - use old modemlights applet that doesn't depend on gnome-system-tools
@@ -703,7 +712,7 @@
 - Update to 2.7.3
 
 * Fri Aug 27 2004 Mark McLoughlin <markmc at redhat.com> 2.7.2-2
-- Run mc-install-default-macros in %post
+- Run mc-install-default-macros in %%post
 - Fixed small-volume patch from Nathan Fredrickson <nathan at silverorange.com>
 
 * Wed Aug 18 2004 Mark McLoughlin <markmc at redhat.com> 2.7.2-1