rpms/gnome-color-manager/devel gnome-color-manager.spec,1.12,1.13
Matthias Clasen
mclasen at fedoraproject.org
Fri Apr 2 05:27:03 UTC 2010
Author: mclasen
Update of /cvs/pkgs/rpms/gnome-color-manager/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14428
Modified Files:
gnome-color-manager.spec
Log Message:
Fix %pre script
Index: gnome-color-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-color-manager/devel/gnome-color-manager.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- gnome-color-manager.spec 31 Mar 2010 20:26:59 -0000 1.12
+++ gnome-color-manager.spec 2 Apr 2010 05:27:02 -0000 1.13
@@ -6,7 +6,7 @@ Summary: Color management tools for GN
Name: gnome-color-manager
Version: 2.30.0
#Release: 0.1.%{?alphatag}git%{?dist}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
Group: Applications/System
URL: http://projects.gnome.org/gnome-color-manager/
@@ -16,11 +16,9 @@ Source0: http://download.gnome.org/sou
Requires: gnome-icon-theme
Requires: shared-mime-info
Requires: shared-color-profiles
-Requires(post): scrollkeeper
Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2
-Requires(postun): scrollkeeper
BuildRequires: gtk2-devel >= 2.16.0
BuildRequires: scrollkeeper
@@ -43,6 +41,7 @@ BuildRequires: sane-backends-devel
BuildRequires: libtiff-devel
BuildRequires: libcanberra-devel
BuildRequires: libnotify-devel
+BuildRequires: GConf2
%description
gnome-color-manager is a session framework that makes it easy to manage, install
@@ -67,15 +66,9 @@ done
%find_lang %name --with-gnome
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post
%gconf_schema_upgrade gnome-color-manager
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache -q %{_datadir}/icons/hicolor &> /dev/null || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
update-desktop-database %{_datadir}/applications &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -86,13 +79,16 @@ update-mime-database %{_datadir}/mime &>
%gconf_schema_remove gnome-color-manager
%postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache -q %{_datadir}/icons/hicolor &> /dev/null || :
+if [ $1 -eq 0 ]; then
+ touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
fi
update-desktop-database %{_datadir}/applications &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
@@ -121,6 +117,10 @@ update-mime-database %{_datadir}/mime &>
%dir %{_localstatedir}/lib/color
%changelog
+* Fri Apr 2 2010 Matthias Clasen <mclasen at redhat.com> 2.30.0-4
+- BR GConf to make the macros work
+- Modernize icon cache handling
+
* Wed Mar 31 2010 Richard Hughes <richard at hughsie.com> 2.30.0-3
- Fix up a scriptlet problem.
- Resolves: #578611
More information about the scm-commits
mailing list