Copy over build mistakenly done on the wrong branch

epel9
Matthias Clasen 14 years ago
parent 8a3686e56f
commit 1bb1c43078

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

@ -1 +1 @@
8e727703343d4c18c73c79dd2009f8ed gnome-icon-theme-2.31.0.tar.bz2 6117a9309e1ac263da9a75899dc4cdee gnome-icon-theme-2.91.6.tar.bz2

Loading…
Cancel
Save