rpms/fedora-logos/devel fedora-logos.spec,1.67,1.68

Adam Jackson (ajax) fedora-extras-commits at redhat.com
Fri Jun 15 20:25:32 UTC 2007


Author: ajax

Update of /cvs/pkgs/rpms/fedora-logos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11968

Modified Files:
	fedora-logos.spec 
Log Message:
* Fri Jun 15 2007 Adam Jackson <ajax at redhat.com> 6.0.98-4
- Remove the Requires on redhat-artwork and fedora-icon-theme, and just
  multi-own the directories.  Fixes some hilarious dependency chains.



Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- fedora-logos.spec	23 Apr 2007 04:26:32 -0000	1.67
+++ fedora-logos.spec	15 Jun 2007 20:24:56 -0000	1.68
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
 Version: 6.0.98
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
 License: Copyright © 1999-2007 Red Hat, Inc.  All rights reserved.
@@ -13,10 +13,6 @@
 Conflicts: kdebase <= 3.1.5
 Conflicts: anaconda-images <= 10
 Conflicts: redhat-artwork <= 5.0.5
-# for /usr/share/icons/Bluecurve
-Requires: redhat-artwork
-# for /usr/share/icons/hicolor
-Requires: hicolor-icon-theme
 
 %description
 The fedora-logos package (the "Packages") contain image files which
@@ -186,6 +182,10 @@
 %{_datadir}/applications/screensavers/*
 %{_datadir}/backgrounds/images/*
 %{_datadir}/gnome-background-properties/*.xml
+# we multi-own these directories, so as not to require the packages that
+# provide them, thereby dragging in excess dependencies.
+%{_datadir}/icons/Bluecurve
+%{_datadir}/icons/hicolor
 
 /usr/lib/anaconda-runtime/boot/*png
 /usr/lib/anaconda-runtime/*.sh
@@ -195,6 +195,10 @@
 # end i386 bits
 
 %changelog
+* Fri Jun 15 2007 Adam Jackson <ajax at redhat.com> 6.0.98-4
+- Remove the Requires on redhat-artwork and fedora-icon-theme, and just
+  multi-own the directories.  Fixes some hilarious dependency chains.
+
 * Mon Apr 23 2007 Matthias Clasen <mclasen at redhat.com> - 6.0.98-3
 - Clean up %%post scriptlet (#237428)
 




More information about the fedora-extras-commits mailing list