rpms/gnome-color-manager/F-13 .cvsignore, 1.7, 1.8 gnome-color-manager.spec, 1.9, 1.10 sources, 1.7, 1.8

[Richard Hughes]

Author: rhughes

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

Modified Files:
	.cvsignore gnome-color-manager.spec sources 
Log Message:
* Mon Mar 29 2010 Richard Hughes <richard at hughsie.com> 2.30.0-1
- New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-color-manager/F-13/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	4 Mar 2010 09:13:42 -0000	1.7
+++ .cvsignore	29 Mar 2010 10:18:03 -0000	1.8
@@ -1 +1 @@
-gnome-color-manager-2.29.5-20100304.tar.gz
+gnome-color-manager-2.30.0.tar.gz


Index: gnome-color-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-color-manager/F-13/gnome-color-manager.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gnome-color-manager.spec	4 Mar 2010 09:13:42 -0000	1.9
+++ gnome-color-manager.spec	29 Mar 2010 10:18:03 -0000	1.10
@@ -1,46 +1,28 @@
-%define gtk2_version                    2.16.0
-%define dbus_glib_version               0.73
-%define unique_version                  1.0.0
 %define alphatag			20100304
 
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary:   Color management tools for GNOME
 Name:      gnome-color-manager
-Version:   2.29.5
-Release:   0.1.%{?alphatag}git%{?dist}
-#Release:   2%{?dist}
+Version:   2.30.0
+#Release:   0.1.%{?alphatag}git%{?dist}
+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.29/%{name}-%{version}.tar.gz
-Source0:   http://download.gnome.org/sources/gnome-color-manager/2.29/%{name}-%{version}-%{?alphatag}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:   http://download.gnome.org/sources/gnome-color-manager/2.30/%{name}-%{version}.tar.gz
+#Source0:   http://download.gnome.org/sources/gnome-color-manager/2.30/%{name}-%{version}-%{?alphatag}.tar.gz
 
-# already upstream
-#Patch0:    gnome-color-manager-2.29.4-fix-gtk-compile.patch
-
-Requires:  gtk2 >= %{gtk2_version}
 Requires:  gnome-icon-theme
-Requires:  unique >= %{unique_version}
 Requires:  shared-mime-info
-Requires:  dbus-glib >= %{dbus_glib_version}
-Requires:  dbus-x11
-Requires:  udev
-Requires:  vte
-Requires:  lcms
-Requires:  cups
-Requires:  polkit
-Requires:  PackageKit
 Requires:  shared-color-profiles
-Requires:  libcanberra >= %{libcanberra_version}
 Requires(post):   scrollkeeper
 Requires(pre):    GConf2
 Requires(post):   GConf2
 Requires(preun):  GConf2
 Requires(postun): scrollkeeper
 
-BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: gtk2-devel >= 2.16.0
 BuildRequires: scrollkeeper
 BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: desktop-file-utils
@@ -48,33 +30,33 @@ BuildRequires: gettext
 BuildRequires: libtool
 BuildRequires: vte-devel
 BuildRequires: gnome-doc-utils
-BuildRequires: unique-devel >= %{unique_version}
+BuildRequires: unique-devel >= 1.0.0
 BuildRequires: intltool
 BuildRequires: libgudev1-devel
-BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
+BuildRequires: dbus-glib-devel >= 0.73
 BuildRequires: libXxf86vm-devel
 BuildRequires: libXrandr-devel
 BuildRequires: gnome-desktop-devel
 BuildRequires: lcms-devel
 BuildRequires: cups-devel
+BuildRequires: sane-backends-devel
 BuildRequires: libtiff-devel
-BuildRequires: libcanberra-devel >= %{libcanberra_version}
+BuildRequires: libcanberra-devel
+BuildRequires: libnotify-devel
 
 %description
 gnome-color-manager is a session framework that makes it easy to manage, install
 and generate color profiles in the GNOME desktop.
 
 %prep
-#%setup -q
-%setup -q -n %{?name}-%{?version}-%{?alphatag}
-#%patch0 -p1 -b .fix-compile
+%setup -q
+#%setup -q -n %{?name}-%{?version}-%{?alphatag}
 
 %build
 %configure --disable-scrollkeeper --disable-schemas-install
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 for i in gcm-prefs gcm-import ; do
@@ -89,9 +71,7 @@ done
 rm -rf $RPM_BUILD_ROOT
 
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-        %{_sysconfdir}/gconf/schemas/gnome-color-manager.schemas >/dev/null || :
+%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 || :
@@ -100,18 +80,10 @@ update-desktop-database %{_datadir}/appl
 update-mime-database %{_datadir}/mime &> /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
+gconf_schema_prepare gnome-color-manager
 
 %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
+%gconf_schema_remove gnome-color-manager
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor
@@ -149,6 +121,9 @@ update-mime-database %{_datadir}/mime &>
 %dir %{_localstatedir}/lib/color
 
 %changelog
+* 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.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-color-manager/F-13/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	4 Mar 2010 09:13:42 -0000	1.7
+++ sources	29 Mar 2010 10:18:03 -0000	1.8
@@ -1 +1 @@
-ccfd6f1dbec39258b3cad1818ca6021b  gnome-color-manager-2.29.5-20100304.tar.gz
+a46b61d7b2837c99c9c612ceb00bdb23  gnome-color-manager-2.30.0.tar.gz