From 1975fb16e71b7df638b6493eca138dc1e70ceb71 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 19 Dec 2011 16:11:34 +0000 Subject: [PATCH] New upstream version. --- .gitignore | 1 + ...-pointer-for-gdk_pixbuf_new_from_fil.patch | 27 ------------------- gnome-color-manager.spec | 14 +++++++--- sources | 2 +- 4 files changed, 12 insertions(+), 32 deletions(-) delete mode 100644 0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch diff --git a/.gitignore b/.gitignore index 35f37e3..90dc05b 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ gnome-color-manager-2.31.4.tar.bz2 /gnome-color-manager-3.1.92.tar.xz /gnome-color-manager-3.2.0.tar.xz /gnome-color-manager-3.2.1.tar.xz +/gnome-color-manager-3.3.3.tar.xz diff --git a/0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch b/0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch deleted file mode 100644 index 586193a..0000000 --- a/0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e0c575ea768f2f5bb01cfc02908ddd48e691999d Mon Sep 17 00:00:00 2001 -From: Michael Hamann -Date: Mon, 3 Oct 2011 00:49:55 +0200 -Subject: [PATCH] Initialize error pointer for - gdk_pixbuf_new_from_file_at_size properly - -Signed-off-by: Richard Hughes ---- - src/gcm-calibrate-main.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/gcm-calibrate-main.c b/src/gcm-calibrate-main.c -index b8ef50a..cdf25ac 100644 ---- a/src/gcm-calibrate-main.c -+++ b/src/gcm-calibrate-main.c -@@ -2072,7 +2072,7 @@ gcm_calib_image_changed_cb (GcmCalibrate *calibrate, - { - gchar *path; - GdkPixbuf *pixbuf; -- GError *error; -+ GError *error = NULL; - - if (filename != NULL) { - path = g_build_filename (GCM_DATA, "icons", filename, NULL); --- -1.7.6.4 - diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec index 37e26c5..0606e58 100644 --- a/gnome-color-manager.spec +++ b/gnome-color-manager.spec @@ -1,11 +1,11 @@ Summary: Color management tools for GNOME Name: gnome-color-manager -Version: 3.2.1 -Release: 2%{?dist} +Version: 3.3.3 +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/3.2/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/gnome-color-manager/3.3/%{name}-%{version}.tar.xz Requires: color-filesystem >= 1-7 Requires: gnome-icon-theme @@ -87,14 +87,17 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README %{_bindir}/gcm-* -%{_libexecdir}/gcm-helper-exiv +%{_libexecdir}/gcm-* %dir %{_datadir}/gnome-color-manager %{_datadir}/gnome-color-manager/gcm-*.ui %dir %{_datadir}/gnome-color-manager/targets %dir %{_datadir}/gnome-color-manager/icons +%dir %{_datadir}/gnome-color-manager/figures +%dir %{_datadir}/gnome-color-manager/ti1 %{_datadir}/gnome-color-manager/targets %{_datadir}/gnome-color-manager/icons %{_datadir}/gnome-color-manager/figures +%{_datadir}/gnome-color-manager/ti1 %{_datadir}/man/man1/*.1.gz %{_datadir}/icons/hicolor/*/*/*.png %{_datadir}/icons/hicolor/scalable/*/*.svg* @@ -102,6 +105,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/dbus-1/services/org.gnome.ColorManager.service %changelog +* Mon Dec 19 2011 Richard Hughes - 3.3.3-1 +- New upstream version. + * Thu Nov 24 2011 Matthias Clasen - 3.2.1-2 - Rebuild against new clutter diff --git a/sources b/sources index 048357a..5bb6709 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76d36a6e915cd4fe08ea25a2f7ed914b gnome-color-manager-3.2.1.tar.xz +8eaaa58516710701697857753f2b4edb gnome-color-manager-3.3.3.tar.xz