rpms/gnome-color-manager/F-13 gnome-color-manager.spec,1.10,1.11

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-color-manager/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14989

Modified Files:
	gnome-color-manager.spec 
Log Message:
fix gconf macros



Index: gnome-color-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-color-manager/F-13/gnome-color-manager.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- gnome-color-manager.spec	29 Mar 2010 10:18:03 -0000	1.10
+++ gnome-color-manager.spec	2 Apr 2010 05:29:28 -0000	1.11
@@ -1,4 +1,4 @@
-%define alphatag			20100304
+%define alphatag                        20100222
 
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
@@ -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:   1%{?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,32 +66,29 @@ 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 || :
 
 %pre
-gconf_schema_prepare gnome-color-manager
+%gconf_schema_prepare gnome-color-manager
 
 %preun
 %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,20 +117,38 @@ 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
+
+* Mon Mar 29 2010 Richard Hughes <richard at hughsie.com> 2.30.0-2
+- Add libnotify BR.
+
 * Mon Mar 29 2010 Richard Hughes <richard at hughsie.com> 2.30.0-1
 - New upstream release.
 
-* Thu Mar 04 2010 Richard Hughes <richard at hughsie.com> 2.29.5-0.1.20100304
-- New snapshot from upstream.
-- Do not crash on startup if we fail to connect to CUPS.
-- Resolves: #570378
-
-* Tue Mar 02 2010 Richard Hughes <richard at hughsie.com> 2.29.4-2
-- Include a patch from upstream to allow build to complete with a broken GTK.
+* Tue Mar 09 2010 Richard Hughes <richard at hughsie.com> 2.29.4-2
+- Update to the latest version of the Fedora Packaging Guidelines
+- Remove the custom BuildRoot
+- Do not clean the buildroot before install
+- Use the gconf_schema defines for the GConf schemas
+- Remove some over-zealous Requires that are already picked up by rpm.
+- Resolves #571658
 
 * Mon Mar 01 2010 Richard Hughes <richard at hughsie.com> 2.29.4-1
 - New upstream release.
 
+* Mon Feb 22 2010 Richard Hughes <richard at hughsie.com> 2.29.4-0.1.20100222
+- Another new snapshot from upstream with lots of bugs fixed from the Fedora
+  test day.
+
+* Wed Feb 18 2010 Richard Hughes <richard at hughsie.com> 2.29.4-0.1.20100218
+- Another new snapshot from upstream for the Fedora test day.
+
 * Wed Feb 17 2010 Richard Hughes <richard at hughsie.com> 2.29.4-0.1.20100217
 - New snapshot from upstream for the Fedora test day.