Compare commits

...

No commits in common. "c8" and "c10s" have entirely different histories.
c8 ... c10s

7 changed files with 172 additions and 79 deletions

65
.gitignore vendored
View File

@ -1 +1,64 @@
SOURCES/gnome-color-manager-3.28.0.tar.xz
gnome-color-manager-2.31.4.tar.bz2
/gnome-color-manager-2.91.1.tar.bz2
/gnome-color-manager-2.91.2-20101102.tar.bz2
/gnome-color-manager-2.91.2.tar.bz2
/gnome-color-manager-2.91.3.tar.bz2
/gnome-color-manager-2.91.5.tar.bz2
/gnome-color-manager-2.91.92.tar.bz2
/gnome-color-manager-3.0.0.tar.bz2
/gnome-color-manager-3.1.1.tar.bz2
/gnome-color-manager-3.1.2.tar.xz
/gnome-color-manager-3.1.90.tar.xz
/gnome-color-manager-3.1.91.tar.xz
/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
/gnome-color-manager-3.3.5.tar.xz
/gnome-color-manager-3.3.91.tar.xz
/gnome-color-manager-3.4.0.tar.xz
/gnome-color-manager-3.5.1.tar.xz
/gnome-color-manager-3.5.3.tar.xz
/gnome-color-manager-3.6.1.tar.xz
/gnome-color-manager-3.7.5.tar.xz
/gnome-color-manager-3.7.92.tar.xz
/gnome-color-manager-3.8.0.tar.xz
/gnome-color-manager-3.8.1.tar.xz
/gnome-color-manager-3.8.2.tar.xz
/gnome-color-manager-3.9.92.tar.xz
/gnome-color-manager-3.10.0.tar.xz
/gnome-color-manager-3.10.1.tar.xz
/gnome-color-manager-3.11.3.tar.xz
/gnome-color-manager-3.11.5.tar.xz
/gnome-color-manager-3.11.90.tar.xz
/gnome-color-manager-3.12.0.tar.xz
/gnome-color-manager-3.12.1.tar.xz
/gnome-color-manager-3.13.1.tar.xz
/gnome-color-manager-3.13.90.tar.xz
/gnome-color-manager-3.14.0.tar.xz
/gnome-color-manager-3.14.1.tar.xz
/gnome-color-manager-3.14.2.tar.xz
/gnome-color-manager-3.15.4.tar.xz
/gnome-color-manager-3.15.90.tar.xz
/gnome-color-manager-3.15.91.tar.xz
/gnome-color-manager-3.15.92.tar.xz
/gnome-color-manager-3.16.0.tar.xz
/gnome-color-manager-3.17.90.tar.xz
/gnome-color-manager-3.18.0.tar.xz
/gnome-color-manager-3.19.90.tar.xz
/gnome-color-manager-3.20.0.tar.xz
/gnome-color-manager-3.21.90.tar.xz
/gnome-color-manager-3.21.91.tar.xz
/gnome-color-manager-3.21.92.tar.xz
/gnome-color-manager-3.22.0.tar.xz
/gnome-color-manager-3.22.1.tar.xz
/gnome-color-manager-3.22.2.tar.xz
/gnome-color-manager-3.23.92.tar.xz
/gnome-color-manager-3.24.0.tar.xz
/gnome-color-manager-3.25.90.tar.xz
/gnome-color-manager-3.26.0.tar.xz
/gnome-color-manager-3.28.0.tar.xz
/gnome-color-manager-3.30.0.tar.xz
/gnome-color-manager-3.32.0.tar.xz
/gnome-color-manager-3.35.90.tar.xz
/gnome-color-manager-3.36.0.tar.xz

View File

@ -1 +0,0 @@
f8ee5eba012c95daed65fd7f2ef3a8545b88959c SOURCES/gnome-color-manager-3.28.0.tar.xz

View File

@ -0,0 +1,24 @@
From 66aea36411477f284fa8a379b3bde282385d281c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 8 Apr 2020 16:41:32 +0200
Subject: [PATCH] Remove forgotten libcanberra include
---
src/gcm-viewer.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/gcm-viewer.c b/src/gcm-viewer.c
index 77463af..d778877 100644
--- a/src/gcm-viewer.c
+++ b/src/gcm-viewer.c
@@ -12,7 +12,6 @@
#include <gdk/gdkx.h>
#include <glib/gstdio.h>
#include <locale.h>
-#include <canberra-gtk.h>
#include <colord.h>
#include <math.h>
--
2.31.1

View File

@ -1,41 +0,0 @@
diff --git a/src/gcm-helper-exiv.cpp b/src/gcm-helper-exiv.cpp
index 9854e79..7ec6994 100644
--- a/src/gcm-helper-exiv.cpp
+++ b/src/gcm-helper-exiv.cpp
@@ -21,6 +21,12 @@
#include <exiv2/image.hpp>
#include <exiv2/exif.hpp>
+
+#if EXIV2_MAJOR_VERSION >= 1 || (EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION >= 27)
+#define HAVE_EXIV2_ERROR_CODE
+#include <exiv2/error.hpp>
+#endif
+
#include <iostream>
#include <iomanip>
@@ -51,7 +57,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 +70,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 */

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

View File

@ -1,38 +1,25 @@
Name: gnome-color-manager
Version: 3.28.0
Release: 3%{?dist}
Version: 3.36.0
Release: 14%{?dist}
Summary: Color management tools for GNOME
License: GPL-2.0-or-later
URL: https://gitlab.gnome.org/GNOME/gnome-color-manager
Source0: http://download.gnome.org/sources/gnome-color-manager/3.36/%{name}-%{version}.tar.xz
License: GPLv2+
URL: http://mail.gnome.org/mailman/listinfo/gnome-color-manager-list
Source0: http://download.gnome.org/sources/gnome-color-manager/3.28/%{name}-%{version}.tar.xz
Patch0: gnome-color-manager-exiv2-027.patch
Patch0: 0001-Remove-forgotten-libcanberra-include.patch
BuildRequires: gcc
BuildRequires: gtk3-devel >= 3.0.0
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: lcms2-devel
BuildRequires: libtiff-devel
BuildRequires: libexif-devel
BuildRequires: exiv2-devel
BuildRequires: libcanberra-devel
BuildRequires: glib2-devel >= 2.25.9-2
BuildRequires: docbook-utils
BuildRequires: colord-devel >= 0.1.12
BuildRequires: colord-gtk-devel >= 0.1.22
BuildRequires: itstool
BuildRequires: meson
BuildRequires: vte291-devel
Requires: shared-mime-info
# Not actually a hard requirement; it just sucks to have to install the
# package using PackageKit before the user can calibrate
%if 0%{?rhel} == 0
Requires: argyllcms
%endif
# obsolete sub-package
Obsoletes: gnome-color-manager-devel <= 3.1.1
Provides: gnome-color-manager-devel
@ -42,9 +29,7 @@ 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
%patch0 -p1 -b .exiv2-027
%autosetup -p1
%build
%meson
@ -59,31 +44,87 @@ and generate color profiles in the GNOME desktop.
%license COPYING
%doc AUTHORS README
%{_bindir}/gcm-*
%{_libexecdir}/gcm-*
%{_datadir}/applications/gcm-*.desktop
%{_datadir}/applications/org.gnome.ColorProfileViewer.desktop
%dir %{_datadir}/gnome-color-manager
%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}/icons/hicolor/*/*/*.png
%{_datadir}/icons/hicolor/scalable/*/*.svg*
%{_datadir}/metainfo/org.gnome.ColorProfileViewer.appdata.xml
%{_mandir}/man1/*.1*
%changelog
* Tue Oct 29 2019 Tomas Pelka <tpelka@redhat.com> - 3.28.0-3
- Rebuild again to correctly trigger side-tag gating (exiv2)
Resolves: bz#1757445
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.36.0-14
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Tue Oct 15 2019 Jan Grulich <jgrulich@redhat.com> - 3.28.0-2
- Rebuild (exiv2)
Resolves: bz#1757445
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.36.0-13
- Bump release for June 2024 mass rebuild
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon May 17 2021 Richard Hughes <rhughes@redhat.com> - 3.36.0-5
- Remove BRs no longer required for building
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-3
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu Apr 02 2020 Kalev Lember <klember@redhat.com> - 3.36.0-1
- Update to 3.36.0
* Wed Mar 04 2020 Kalev Lember <klember@redhat.com> - 3.35.90-1
- Update to 3.35.90
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.32.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jan 23 2020 Richard Hughes <rhughes@redhat.com> - 3.32.0-3
- Remove the req for argyllcms as it is now orphaned
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.32.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Mar 11 2019 Kalev Lember <klember@redhat.com> - 3.32.0-1
- Update to 3.32.0
* Wed Jan 30 2019 Rex Dieter <rdieter@fedoraproject.org> - 3.30.0-3
- rebuild (exiv2)
* Wed Jan 30 2019 Björn Esser <besser82@fedoraproject.org> - 3.30.0-2
- rebuild (exiv2)
* Thu Sep 06 2018 Kalev Lember <klember@redhat.com> - 3.30.0-1
- Update to 3.30.0
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Mar 12 2018 Kalev Lember <klember@redhat.com> - 3.28.0-1
- Update to 3.28.0

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (gnome-color-manager-3.36.0.tar.xz) = 217c00696d7d0e99ee4cc65ee343c09682387d909feabdd6e4a52f9fd0586dda553b4796fbcb11392b880aa5c5bbaebde27906afb4e3ffd692ee3187023bfaac