[gnome-color-manager/f14/master] * Fri Aug 06 2010 Richard Hughes <richard at hughsie.com> 2.31.6-1 - New upstream release. - This is 2.

Fri Aug 6 13:38:41 UTC 2010

commit 0cf99527d3628b4810fcae6fc3006b22f24ce27a
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Aug 6 14:36:53 2010 +0100

    * Fri Aug 06 2010 Richard Hughes <richard at hughsie.com> 2.31.6-1
    - New upstream release.
    - This is 2.31.6, which is forked from the gnome-2-30 branch.
    - If you have been using 2.31.5 or any earlier 2.31 version, then you will
      notice the UI and functionality going back in time. This is unfortunate.

 .gitignore               |    1 +
 gnome-color-manager.spec |   75 +++++++++++++++++++++++++++-------------------
 sources                  |    2 +-
 3 files changed, 46 insertions(+), 32 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index a025310..febe7f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gnome-color-manager-2.31.4.tar.bz2
+gnome-color-manager-2.31.6.tar.gz
diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec
index 8dd6267..3e05a4f 100644
--- a/gnome-color-manager.spec
+++ b/gnome-color-manager.spec
@@ -2,20 +2,19 @@
 
 Summary:   Color management tools for GNOME
 Name:      gnome-color-manager
-Version:   2.31.4
+Version:   2.31.6
 Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://projects.gnome.org/gnome-color-manager/
-Source0:   http://download.gnome.org/sources/gnome-color-manager/2.31/%{name}-%{version}.tar.bz2
+Source0:   http://download.gnome.org/sources/gnome-color-manager/2.31/%{name}-%{version}.tar.gz
 
 Requires:  color-filesystem >= 1-7
 Requires:  gnome-icon-theme
 Requires:  shared-mime-info
 Requires:  shared-color-profiles
 Requires:  yelp
-Requires:  dconf
-Requires:  GConf2 >= 2.31.1
+Requires:  GConf2
 
 BuildRequires: gtk2-devel >= 2.16.0
 BuildRequires: scrollkeeper
@@ -25,21 +24,18 @@ BuildRequires: gettext
 BuildRequires: libtool
 BuildRequires: vte-devel
 BuildRequires: gnome-doc-utils
+BuildRequires: unique-devel >= 1.0.0
 BuildRequires: intltool
 BuildRequires: libgudev1-devel
+BuildRequires: dbus-glib-devel >= 0.73
 BuildRequires: libXxf86vm-devel
 BuildRequires: libXrandr-devel
-BuildRequires: gnome-desktop3-devel
-BuildRequires: lcms2-devel
+BuildRequires: gnome-desktop-devel
+BuildRequires: lcms-devel
 BuildRequires: cups-devel
 BuildRequires: sane-backends-devel
 BuildRequires: libtiff-devel
-BuildRequires: libexif-devel
-BuildRequires: exiv2-devel
 BuildRequires: libcanberra-devel
-BuildRequires: libnotify-devel >= 0.5.0
-BuildRequires: glib2-devel >= 2.25.9-2
-BuildRequires: control-center-devel >= 2.31.4
 
 %description
 gnome-color-manager is a session framework that makes it easy to manage, install
@@ -61,59 +57,76 @@ for i in gcm-prefs gcm-import ; do
     $RPM_BUILD_ROOT%{_datadir}/applications/$i.desktop
 done
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/*.la
-
 %find_lang %name --with-gnome
 
 %post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+        %{_sysconfdir}/gconf/schemas/gnome-color-manager.schemas >/dev/null || :
+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
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
-glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/gnome-color-manager.schemas &> /dev/null || :
+fi
+
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/gnome-color-manager.schemas &> /dev/null || :
+fi
 
 %postun
-if [ $1 -eq 0 ]; then
-    touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+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
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
-glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
 /lib/udev/rules.d/*.rules
 %{_bindir}/gcm-*
-%{_libexecdir}/*
 %dir %{_datadir}/gnome-color-manager
 %{_datadir}/gnome-color-manager/gcm-*.ui
 %dir %{_datadir}/gnome-color-manager/targets
 %dir %{_datadir}/gnome-color-manager/icons
-%{_datadir}/gnome-color-manager/targets
-%{_datadir}/gnome-color-manager/icons
-%{_datadir}/gnome-color-manager/figures
+%{_datadir}/gnome-color-manager/targets/*.png
+%{_datadir}/gnome-color-manager/icons/*.svg
+#%{_datadir}/gnome-color-manager/icons/*.png
 %{_datadir}/man/man1/*.1.gz
 %{_datadir}/gnome/help/gnome-color-manager
 %{_datadir}/omf/gnome-color-manager
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/icons/hicolor/scalable/*/*.svg*
+%config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/applications/gcm-prefs.desktop
 %{_datadir}/applications/gcm-import.desktop
 %{_sysconfdir}/xdg/autostart/*.desktop
 %{_datadir}/dbus-1/services/org.gnome.ColorManager.service
 %{_sbindir}/gcm-install-system-wide
 %{_datadir}/polkit-1/actions/org.gnome.color.policy
-%{_datadir}/glib-2.0/schemas/org.gnome.color-manager.gschema.xml
-%{_datadir}/GConf/gsettings/org.gnome.color-manager.gschema.migrate
-%{_datadir}/dbus-1/interfaces/org.gnome.ColorManager.xml
-%{_libdir}/control-center-1/panels/*.so
+
+# this is probably better in a shared package
+%dir %{_localstatedir}/lib/color
 
 %changelog
+* Fri Aug 06 2010 Richard Hughes <richard at hughsie.com> 2.31.6-1
+- New upstream release.
+- This is 2.31.6, which is forked from the gnome-2-30 branch.
+- If you have been using 2.31.5 or any earlier 2.31 version, then you will
+  notice the UI and functionality going back in time. This is unfortunate.
+
 * Thu Jul 01 2010 Richard Hughes <richard at hughsie.com> 2.31.4-1
 - New upstream release.
 
diff --git a/sources b/sources
index adeeb54..81ec87e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9919bdaddc4ef7e190a2859a2435ebdd  gnome-color-manager-2.31.4.tar.bz2
+4127cc6c9dfc8c71ac3b2a6acdb84b16  gnome-color-manager-2.31.6.tar.gz
