diff options
| author | Matthias Clasen <mclasen@fedoraproject.org> | 2006-12-09 05:57:54 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@fedoraproject.org> | 2006-12-09 05:57:54 +0000 |
| commit | 7d410b2b957e2488a4329ddc4498df01eca78eac (patch) | |
| tree | 00b74ef48ab936bf8e17049459b81fef315f6bc5 | |
| parent | 8287b5c9bd451fa44258f223258ef677e2b05f72 (diff) | |
| download | gnome-applets-7d410b2b957e2488a4329ddc4498df01eca78eac.tar.gz gnome-applets-7d410b2b957e2488a4329ddc4498df01eca78eac.tar.xz gnome-applets-7d410b2b957e2488a4329ddc4498df01eca78eac.zip | |
spec file cleanupgnome-applets-2_16_2-4_fc7
| -rw-r--r-- | gnome-applets.spec | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/gnome-applets.spec b/gnome-applets.spec index d9c28cd..f0dfcb4 100644 --- a/gnome-applets.spec +++ b/gnome-applets.spec @@ -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 @@ Patch27: gnome-applets-2.16.1-desktop-files.patch # 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: pygtk2-devel >= %{pygtk_version} 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: gnome-panel >= %{gnome_panel_version} 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 @@ rm -rf $RPM_BUILD_ROOT %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 @@ fi %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 @@ fi %{_libdir}/pkgconfig/gweather.pc %changelog +* Sat Dec 9 2006 Matthias Clasen <mclasen@redhat.com> - 1:2.16.2-4 +- Small spec file cleanups + * Thu Dec 7 2006 Jeremy Katz <katzj@redhat.com> - 1:2.16.2-3 - rebuild for python 2.5 @@ -643,8 +652,8 @@ fi - actually build the old modemlights that were added in 2.10.0-4 * Tue Apr 5 2005 Ray Strode <rstrode@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@redhat.com> 1:2.10.0-4 - use old modemlights applet that doesn't depend on gnome-system-tools @@ -703,7 +712,7 @@ fi - Update to 2.7.3 * Fri Aug 27 2004 Mark McLoughlin <markmc@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@silverorange.com> * Wed Aug 18 2004 Mark McLoughlin <markmc@redhat.com> 2.7.2-1 |