diff --git a/gnome-icon-theme.spec b/gnome-icon-theme.spec index 1a3e42a..621b9d4 100644 --- a/gnome-icon-theme.spec +++ b/gnome-icon-theme.spec @@ -1,16 +1,20 @@ Summary: GNOME icon theme Name: gnome-icon-theme -Version: 2.31.0 -Release: 2%{?dist} +Version: 2.91.6 +Release: 1%{?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 +Source0: http://download.gnome.org/sources/gnome-icon-theme/2.91/%{name}-%{version}.tar.bz2 License: GPL+ BuildArch: noarch Group: User Interface/Desktops -BuildRequires: icon-naming-utils +BuildRequires: icon-naming-utils >= 0.8.7 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. @@ -31,7 +35,7 @@ available under old names. %configure --enable-icon-mapping %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +make install DESTDIR=$RPM_BUILD_ROOT # Add scalable directories for symbolic icons (cd $RPM_BUILD_ROOT%{_datadir}/icons/gnome @@ -46,52 +50,39 @@ 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 -%post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - %posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - -%post legacy -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || : -%postun legacy -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi +%postun +gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || : %posttrans legacy -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || : +%postun legacy +gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || : %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 2.31.0-2 -- Merge-review cleanup (#225818) +* Wed Feb 2 2011 Matthias Clasen 2.91.6-1 +- Update to 2.91.6 * Thu Aug 5 2010 Matthias Clasen 2.31.0-1 - Update to 2.31.0 diff --git a/sources b/sources index 15c7aec..b00af3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8e727703343d4c18c73c79dd2009f8ed gnome-icon-theme-2.31.0.tar.bz2 +6117a9309e1ac263da9a75899dc4cdee gnome-icon-theme-2.91.6.tar.bz2