Clean out the cruft

The panel has really built up a lot of patches.
This isn't good for anyone.  Time to play the
aggresive role of cutting everything out, and then
adding back anything that we really deem necessary
with a very conservative view of "necessary".

1 files changed, 8 insertions, 54 deletions

diff --git a/gnome-panel.spec b/gnome-panel.spec
index a3d2304..3613237 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,19 +22,15 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.91.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/gnome-panel
 Source0: http://download.gnome.org/sources/gnome-panel/2.91/%{name}-%{version}.tar.bz2
 
-Source3: redhat-panel-default-setup.entries
-Source4: gnome-compiler-flags.m4
-Source5: redhat-panel-backwards-compat-config.schemas
-Source6: add-translations.sh
 License: GPLv2+ and LGPLv2+ and GFDL
 Group: User Interface/Desktops
 
-Requires: gnome-desktop >= %{gnome_desktop_version}
+Requires: gnome-desktop3 >= %{gnome_desktop_version}
 Requires: libwnck3 >= %{libwnck_version}
 Requires: gnome-menus >= %{gnome_menus_version}
 %if %{use_evolution_data_server}
@@ -91,34 +87,6 @@ BuildRequires: desktop-file-utils
 BuildRequires: gobject-introspection-devel
 
 Obsoletes: gdm-user-switch-applet < 1:2.91.6
-
-Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
-
-# the next three patches belong together
-# http://bugzilla.gnome.org/show_bug.cgi?id=470966
-Patch8: launcher-desktop-files.patch
-#Patch9: desktop-file-monitoring.patch
-Patch10: preferred-apps.patch
-
-# don't pop up an error dialog if an applet from the
-# default configuration is missing; we don't want to
-# add a hard dependency on e.g. tomboy
-#Patch11: applet-error.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=520111
-Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=579092
-Patch38: clock-network.patch
-
-Patch40: clock-home.patch
-Patch41: bookmarks-submenu.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=537798
-Patch47: fix-clock-crash.patch
-
-Patch48: gnome-panel-libs.patch
-
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -149,24 +117,9 @@ Panel Applets using the libpanel-applet library.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .speak-to-us-ye-old-wise-fish
-%patch8 -p1 -b .launcher-desktop-files
-#%patch9 -p1 -b .desktop-file-monitoring
-%patch10 -p1 -b .preferred-apps
-#%patch11 -p1 -b .applet-error
-%patch24 -p1 -b .allow-spurious-view-done-signals
-%patch38 -p1 -b .clock-network
-%patch40 -p1 -b .clock-home
-%patch41 -p1 -b .bookmarks-submenu
-%patch47 -p1 -b .fix-clock-crash
-%patch48 -p1 -b .libs
-
-cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
-cp -f %{SOURCE4} m4
-cp -f %{SOURCE5} gnome-panel/panel-compatibility.schemas
+
 rm -f libtool
 autoreconf -i -f
-
 %build
 %configure \
    --disable-gtk-doc \
@@ -200,8 +153,7 @@ sed -e 's|/schemas/apps/workspace_switcher_applet/prefs/|/schemas/apps/pager_app
 
 ## blow away stuff we don't want
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
-rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-4.*a
-
+find $RPM_BUILD_ROOT -name '*.*a' -delete;
 
 desktop-file-install --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -235,7 +187,6 @@ gconftool-2 --makefile-install-rule \
 	%{_sysconfdir}/gconf/schemas/tasklist.schemas \
 	%{_sysconfdir}/gconf/schemas/window-list.schemas \
 	%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas \
-	%{_sysconfdir}/gconf/schemas/notification_area_applet.schemas \
   > /dev/null || :
 
 #
@@ -322,10 +273,10 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
 %{_datadir}/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
 %{_datadir}/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
 %{_datadir}/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
-%{_libdir}/girepository-1.0/PanelApplet-4.0.typelib
 
 %files libs
 %{_libdir}/*.so.*
+%{_libdir}/girepository-1.0/PanelApplet-4.0.typelib
 
 %files devel
 %defattr(-, root, root)
@@ -337,6 +288,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
 %{_datadir}/gir-1.0/PanelApplet-4.0.gir
 
 %changelog
+* Wed Feb 02 2011 Ray Strode <rstrode@redhat.com> 2.91.6-3
+- Cut out the layers of built up cruft.
+
 * Wed Feb  2 2011 Matthias Clasen <mclasen@redhat.com> 2.91.6-2
 - Various build fixes