diff --git a/gnome-applets.spec b/gnome-applets.spec index ae067e9..b35e25d 100644 --- a/gnome-applets.spec +++ b/gnome-applets.spec @@ -18,7 +18,7 @@ Summary: Small applications for the GNOME panel. Name: gnome-applets Version: 2.8.0 -Release: 1 +Release: 2 Epoch: 1 License: GPL Group: User Interface/Desktops @@ -46,6 +46,9 @@ Requires: gnome-panel >= %{gnome_panel_version} Requires: libxklavier >= %{libxklavier_version} Requires: gstreamer-plugins >= %{gstreamer_plugins_version} +# For wireless-applet backwards compat +Requires: gnome-netstatus >= 2.8.0-2 + Obsoletes: battstat_applet Source2: omf.make @@ -56,6 +59,8 @@ Patch1: gnome-applets-2.3.6-ppp-command.patch Patch2: gnome-applets-2.3.6-uniquecd.patch # Shrink volume applet for msw Patch4: gnome-applets-2.7.2-smallvolume.patch +# Activate netstatus for wireless-applet backwards compat (#131652) +Patch5: gnome-applets-2.8.0-use-netstatus-for-wireless.patch %description @@ -79,6 +84,7 @@ cp %{SOURCE2} . %patch1 -p1 -b .ppp-command %patch2 -p1 -b .uniquecd %patch4 -p1 -b .smallvolume +%patch5 -p1 -b .use-netstatus-for-wireless %build @@ -108,6 +114,14 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL # Clean up unpackaged files rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper +# Remove the wireless applet +rm -rf $RPM_BUILD_ROOT%{_libexecdir}/wireless-applet +rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-2.0/ui/GNOME_WirelessApplet.xml +rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/help/wireless +rm -rf $RPM_BUILD_ROOT%{_datadir}/omf/gnome-applets/wireless*.omf +rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/wireless-applet +rm -rf $RPM_BUILD_ROOT%{_datadir}/wireless-applet + %clean rm -rf $RPM_BUILD_ROOT @@ -144,7 +158,6 @@ done %endif %{_datadir}/gswitchit %{_datadir}/omf -%{_datadir}/wireless-applet %{_datadir}/gen_util %{_bindir}/* %{_libdir}/bonobo @@ -160,6 +173,10 @@ done %changelog +* Tue Sep 21 2004 Mark McLoughlin 2.8.0-2 +- Remove the wireless applet and add patch to use the netstatus + applet for backwards compat. bug #131652. + * Tue Sep 21 2004 Mark McLoughlin 2.8.0-1 - Update to 2.8.0