rpms/fedora-icon-theme/devel fedora-icon-theme.spec,1.8,1.9

Matthias Clasen mclasen at fedoraproject.org
Mon Nov 30 16:55:59 UTC 2009


Author: mclasen

Update of /cvs/pkgs/rpms/fedora-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23261

Modified Files:
	fedora-icon-theme.spec 
Log Message:
Drop old Bluecurve-era icons



Index: fedora-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-icon-theme/devel/fedora-icon-theme.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- fedora-icon-theme.spec	24 Jul 2009 22:35:55 -0000	1.8
+++ fedora-icon-theme.spec	30 Nov 2009 16:55:59 -0000	1.9
@@ -1,14 +1,14 @@
 Summary: Fedora icon theme
 Name: fedora-icon-theme
 Version: 1.0.0
-Release: 6%{?dist} 
+Release: 7%{?dist}
 BuildArch: noarch
 License: GPL+
 Group: User Interface/Desktops
 # There is no official upstream yet
 Source0: %{name}-%{version}.tar.bz2
 URL: http://www.redhat.com
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: perl(XML::Parser)
 Requires: gnome-themes
@@ -19,33 +19,22 @@ Provides: system-icon-theme
 This package contains the Fedora icon theme.
 
 %prep
-%setup -q 
+%setup -q
 
 %build
-%configure 
+%configure
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# We provide the redhat files in pixmaps for backward compat,
-# and so they're available for all themes. 
-# If we didn't care about backward compat, then hicolor would
-# be better than pixmaps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-(cd $RPM_BUILD_ROOT%{_datadir}/pixmaps;
-   for icon in ../icons/Fedora/48x48/apps/{redhat-,temp-home}*.png; do
-       ln -s $icon .
-   done
-)
+# Don't install old icons anymore
+rm -f $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/*/*/*.png
 
 # These are empty
 rm -f ChangeLog NEWS README
 
-# The upstream packages may gain po files at some point in the near future
-%find_lang %{name} || touch %{name}.lang
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -61,13 +50,15 @@ if [ -x %{_bindir}/gtk-update-icon-cache
     %{_bindir}/gtk-update-icon-cache -f --quiet %{_datadir}/icons/Fedora || :
 fi
 
-%files -f %{name}.lang
+%files
 %defattr(-, root, root)
 %doc AUTHORS COPYING
 %{_datadir}/icons/Fedora
-%{_datadir}/pixmaps/*.png
 
 %changelog
+* Tue Nov 24 2009 Matthias Clasen <mclasen at redhat.com> - 1.0.0-7
+- Drop old icons
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 




More information about the fedora-extras-commits mailing list