rpms/control-center/devel control-center.spec,1.219,1.220

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16065

Modified Files:
	control-center.spec 
Log Message:
- remove crufty sed replace line
- use find -name '*.la' instead of removing each one
  individually



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- control-center.spec	29 Jan 2007 19:41:00 -0000	1.219
+++ control-center.spec	5 Feb 2007 21:53:38 -0000	1.220
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.17.90
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -121,14 +121,11 @@
 BuildRequires: dbus-devel >= 0.90
 BuildRequires: dbus-glib-devel >= 0.70
 
-Requires(pre): GConf2
-
 Requires(preun): GConf2
-
+Requires(pre): GConf2
 Requires(post): GConf2
 Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
 Requires(post): shared-mime-info
-
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
 Requires(postun): shared-mime-info
 
@@ -204,21 +201,10 @@
   --remove-category X-Red-Hat-Base					\
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-default-applications.desktop
 
-# bug 171059
-sed -i -e 's/=Font$/=Fonts/g' $RPM_BUILD_ROOT%{_datadir}/applications/gnome-font-properties.desktop 
-
-# desktop-file-install really should not be generating this
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache
-
 cp -f $RPM_BUILD_ROOT%{_datadir}/control-center-2.0/icons/* $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
-# fix installed but not packaged
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.la
-
-# loadable modules don't need static versions or .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/window-manager-settings/*.*a
-rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.*a
+# remove useless libtool archive files
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 # don't package mime caches
 rm -f $RPM_BUILD_ROOT%{_datadir}/mime/XMLnamespaces
@@ -327,6 +313,11 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Feb  5 2007 Ray Strode <rstrode at redhat.com> - 2.17.90-4
+- remove crufty sed replace line
+- use find -name '*.la' instead of removing each one
+  individually
+
 * Mon Jan 29 2007 Matthias Clasen <mclasen at redhat.com> - 2.17.90-3
 - Support tracker in the search keybinding (#216315)