- Merge-review cleanup (#225818)

gnome-icon-theme.spec

@@ -1,20 +1,16 @@
 Summary: GNOME icon theme
 Name: gnome-icon-theme
 Version: 2.31.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 #VCS: git:git://git.gnome.org/gnome-icon-theme
 Source0: http://download.gnome.org/sources/gnome-icon-theme/2.31/%{name}-%{version}.tar.bz2
 License: GPL+
 BuildArch: noarch
 Group: User Interface/Desktops
-BuildRequires: icon-naming-utils >= 0.8.7
+BuildRequires: icon-naming-utils
 BuildRequires: gettext
-BuildRequires: librsvg2
 BuildRequires: intltool
 Requires: hicolor-icon-theme
-Requires: pkgconfig
-Requires(posttrans): gtk2 >= 2.6.2
-Requires(postun): gtk2 >= 2.6.2
 
 %description
 This package contains the default icon theme used by the GNOME desktop.
@@ -35,7 +31,7 @@ available under old names.
 %configure --enable-icon-mapping
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # Add scalable directories for symbolic icons
 (cd $RPM_BUILD_ROOT%{_datadir}/icons/gnome
@@ -50,37 +46,53 @@ mkdir -p scalable/status
 )
 
 (cd $RPM_BUILD_ROOT%{_datadir}
- echo "%%defattr(-,root,root)"
+ echo "%%defattr(-,root,root,-)"
  find icons/gnome \( -name gtk-* -or -type f \) -printf "%%%%{_datadir}/%%p\n"
  find icons/gnome -type d -printf "%%%%dir %%%%{_datadir}/%%p\n"
 ) > files.txt
 
 (cd $RPM_BUILD_ROOT%{_datadir}
- echo "%%defattr(-,root,root)"
+ echo "%%defattr(-,root,root,-)"
  find icons/gnome \( -type l -and -not -name gtk-* \) -printf "%%%%{_datadir}/%%p\n"
 ) > legacy.txt
 
-%posttrans
+%post
-gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
 
-%posttrans legacy
+%posttrans
-gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%post legacy
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun legacy
-gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans legacy
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files -f files.txt
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING AUTHORS
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %files legacy -f legacy.txt
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 
 %changelog
+* Wed Sep 29 2010 Parag Nemade <paragn AT fedoraproject.org> 2.31.0-2
+- Merge-review cleanup (#225818)
+
 * Thu Aug  5 2010 Matthias Clasen <mclasen@redhat.com> 2.31.0-1
 - Update to 2.31.0