- updated to 3.32.0

- removed obsolete exiv2-0.27 patch

diff --git a/exiv2-0.27.patch b/exiv2-0.27.patch
deleted file mode 100644 (file)
index 9149de9..0000000
--- a/exiv2-0.27.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 6ef6bf5e3909531b874f86cb95381fa0668cf90b Mon Sep 17 00:00:00 2001
-From: Ting-Wei Lan <lantw@src.gnome.org>
-Date: Sun, 18 Nov 2018 14:09:08 +0800
-Subject: [PATCH] Fix build with Exiv2 0.27
-
-The first parameter of Exiv2::Error has changed from an int to an
-Exiv2::ErrorCode enum.
----
- src/gcm-helper-exiv.cpp | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/gcm-helper-exiv.cpp b/src/gcm-helper-exiv.cpp
-index 9854e79..ffbc82c 100644
---- a/src/gcm-helper-exiv.cpp
-+++ b/src/gcm-helper-exiv.cpp
-@@ -24,6 +24,10 @@
- #include <iostream>
- #include <iomanip>
- 
-+#if EXIV2_MAJOR_VERSION >= 1 || (EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION >= 27)
-+#define HAVE_EXIV2_ERROR_CODE
-+#endif
-+
- int
- main (int argc, char* const argv[])
- {
-@@ -51,7 +55,11 @@ main (int argc, char* const argv[])
-               if (argc == 2)
-                       filename = argv[1];
-               if (filename.empty())
-+#ifdef HAVE_EXIV2_ERROR_CODE
-+                      throw Exiv2::Error(Exiv2::kerErrorMessage, "No filename specified");
-+#else
-                       throw Exiv2::Error(1, "No filename specified");
-+#endif
-               image = Exiv2::ImageFactory::open(filename);
-               image->readMetadata();
- 
-@@ -60,7 +68,11 @@ main (int argc, char* const argv[])
-               if (exifData.empty()) {
-                       std::string error(argv[1]);
-                       error += ": No Exif data found in the file";
-+#ifdef HAVE_EXIV2_ERROR_CODE
-+                      throw Exiv2::Error(Exiv2::kerErrorMessage, error);
-+#else
-                       throw Exiv2::Error(1, error);
-+#endif
-               }
- 
-               /* try to find make, model and serial number */
--- 
-2.18.1
-

diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec
index 7ed162f06fe5ae3facf88010fc0ec4603ef91735..e38969da482c6ed6867e276f11a102eaa947d527 100644 (file)
--- a/gnome-color-manager.spec
+++ b/gnome-color-manager.spec
@@ -1,15 +1,13 @@
 Summary:       Color management tools for GNOME
 Summary(pl.UTF-8):     Narzędzia do zarządzania kolorami dla GNOME
 Name:          gnome-color-manager
-Version:       3.30.0
+Version:       3.32.0
 Release:       1
-License:       GPL v2
+License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-color-manager/3.30/%{name}-%{version}.tar.xz
-# Source0-md5: f1caa9d4ece97e21b4ff1147201b6dd3
-Patch0:                exiv2-0.27.patch
-URL:           https://github.com/GNOME/gnome-color-manager
-BuildRequires: appstream-glib-devel
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-color-manager/3.32/%{name}-%{version}.tar.xz
+# Source0-md5: e6de219a25ac16630aca552936611c15
+URL:           https://gitlab.gnome.org/GNOME/gnome-color-manager
 BuildRequires: colord-devel >= 1.3.1
 BuildRequires: colord-gtk-devel >= 0.1.20
 BuildRequires: docbook-dtd41-sgml
@@ -17,20 +15,19 @@ BuildRequires:      docbook-utils
 BuildRequires: exiv2-devel
 BuildRequires: gettext-tools >= 0.19.7
 BuildRequires: glib2-devel >= 1:2.32.0
-BuildRequires: gnome-common
 BuildRequires: gtk+3-devel >= 3.0.0
 BuildRequires: gtk-doc >= 1.9
 BuildRequires: lcms2-devel >= 2.2
 BuildRequires: libcanberra-gtk3-devel >= 0.10
 BuildRequires: libexif-devel
 BuildRequires: libstdc++-devel
-BuildRequires: libtiff-devel
+BuildRequires: libtiff-devel >= 4
 BuildRequires: libxslt-progs
-BuildRequires: meson
-BuildRequires: ninja
+BuildRequires: meson >= 0.46.0
+BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(find_lang) >= 1.23
-BuildRequires: rpmbuild(macros) >= 1.601
+BuildRequires: rpmbuild(macros) >= 1.736
 BuildRequires: tar >= 1:1.22
 BuildRequires: vte-devel >= 0.28.0
 BuildRequires: xz
@@ -61,7 +58,6 @@ kolorów.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %meson build
@@ -99,8 +95,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gcm-picker
 %attr(755,root,root) %{_bindir}/gcm-viewer
 %attr(755,root,root) %{_libexecdir}/gcm-helper-exiv
-%{_datadir}/metainfo/org.gnome.ColorProfileViewer.appdata.xml
 %{_datadir}/gnome-color-manager
+%{_datadir}/metainfo/org.gnome.ColorProfileViewer.appdata.xml
 %{_desktopdir}/gcm-calibrate.desktop
 %{_desktopdir}/gcm-import.desktop
 %{_desktopdir}/gcm-picker.desktop