From 02a166c3f4f499ebadf645145738bf63f4517f9bca84cff4ed11c35eb2a5850d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 21 Mar 2022 08:34:45 +0000 Subject: [PATCH 1/2] Accepting request 962774 from GNOME:Next GNOME 42 - here we come OBS-URL: https://build.opensuse.org/request/show/962774 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/colord-gtk?expand=0&rev=19 --- _service | 21 +++++++++++++++++++++ _servicedata | 4 ++++ baselibs.conf | 1 + colord-gtk-0.2.0+8.obscpio | 3 +++ colord-gtk-0.2.0.tar.xz | 3 --- colord-gtk.changes | 15 +++++++++++++++ colord-gtk.obsinfo | 4 ++++ colord-gtk.spec | 29 ++++++++++++++++++++++++----- 8 files changed, 72 insertions(+), 8 deletions(-) create mode 100644 _service create mode 100644 _servicedata create mode 100644 colord-gtk-0.2.0+8.obscpio delete mode 100644 colord-gtk-0.2.0.tar.xz create mode 100644 colord-gtk.obsinfo diff --git a/_service b/_service new file mode 100644 index 0000000..349b4b8 --- /dev/null +++ b/_service @@ -0,0 +1,21 @@ + + + https://github.com/hughsie/colord-gtk.git + git + @PARENT_TAG@+@TAG_OFFSET@ + COLORD_GTK_(\d+)_(\d+)_(\d+)(\+0)?(\+[1-9][0-9]*)? + \1.\2.\3\5 + enable + c6fd5ab9bde0a23158f236a808722bacc661b57c + + + + + *.tar + xz + + + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..5dd782d --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/hughsie/colord-gtk.git + c6fd5ab9bde0a23158f236a808722bacc661b57c \ No newline at end of file diff --git a/baselibs.conf b/baselibs.conf index 834de06..921b2b5 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1,2 @@ libcolord-gtk1 +libcolord-gtk4-1 diff --git a/colord-gtk-0.2.0+8.obscpio b/colord-gtk-0.2.0+8.obscpio new file mode 100644 index 0000000..de32dcd --- /dev/null +++ b/colord-gtk-0.2.0+8.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f8ed89bbc3fb7c0326c257598e106311a10aeae24c9e15df4583cc55d7614d3 +size 110603 diff --git a/colord-gtk-0.2.0.tar.xz b/colord-gtk-0.2.0.tar.xz deleted file mode 100644 index b62aa3b..0000000 --- a/colord-gtk-0.2.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717 -size 20480 diff --git a/colord-gtk.changes b/colord-gtk.changes index 44ec778..f169db2 100644 --- a/colord-gtk.changes +++ b/colord-gtk.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Feb 15 20:51:48 UTC 2022 - bjorn.lie@gmail.com + +- Update to version 0.2.0+8: + * trivial: Fix link to homepage + * trivial: Use the right vala package + * build: Make GTK3 build optional too + * Add a GTK4 variant + * build: Rename 'gtk' meson variable to 'gtk3' + * Make introspection optional in meson + * Update the example spec file + * trivial: post release version bump +- Switch to git checkout. +- Add pkgconfig(gtk4) BuildRequires: Build the new gtk4 support. + ------------------------------------------------------------------- Fri Oct 22 16:31:42 UTC 2021 - Bjørn Lie diff --git a/colord-gtk.obsinfo b/colord-gtk.obsinfo new file mode 100644 index 0000000..9145f4c --- /dev/null +++ b/colord-gtk.obsinfo @@ -0,0 +1,4 @@ +name: colord-gtk +version: 0.2.0+8 +mtime: 1640773658 +commit: c6fd5ab9bde0a23158f236a808722bacc661b57c diff --git a/colord-gtk.spec b/colord-gtk.spec index 34dee59..3e1d1cf 100644 --- a/colord-gtk.spec +++ b/colord-gtk.spec @@ -1,7 +1,7 @@ # # spec file for package colord-gtk # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: colord-gtk -Version: 0.2.0 +Version: 0.2.0+8 Release: 0 Summary: System Daemon for Managing Color Devices -- GTK Integration License: LGPL-2.1-or-later Group: System/Daemons URL: https://www.freedesktop.org/software/colord -Source0: %{url}/releases/%{name}-%{version}.tar.xz +Source: %{name}-%{version}.tar.xz Source99: baselibs.conf BuildRequires: docbook5-xsl-stylesheets @@ -41,6 +41,7 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gtk4) BuildRequires: pkgconfig(lcms2) >= 2.2 %description @@ -60,6 +61,18 @@ colord is a system activated daemon that maps devices to color profiles. It is used by gnome-color-manager for system integration and use when there are no users logged in. +%package -n libcolord-gtk4-1 +Summary: System Daemon for Managing Color Devices -- GTK Integration Library +Group: System/Libraries +Suggests: colord +# for the -lang package to be installable +#Provides: %%{name} = %%{version} + +%description -n libcolord-gtk4-1 +colord is a system activated daemon that maps devices to color profiles. +It is used by gnome-color-manager for system integration and use when +there are no users logged in. + %package -n typelib-1_0-ColordGtk-1_0 Summary: GTK Integration Introspection bindings for colord-gtk Group: System/Libraries @@ -76,6 +89,7 @@ libcolord-gtk library. Summary: System Daemon for Managing Color Devices -- GTK Integration Development Files Group: Development/Languages/C and C++ Requires: libcolord-gtk1 = %{version} +Requires: libcolord-gtk4-1 = %{version} Requires: typelib-1_0-ColordGtk-1_0 = %{version} %description -n libcolord-gtk-devel @@ -107,8 +121,8 @@ This package contains development documentation for the colord-gtk packages. %meson_install %find_lang %{name} %{?no_lang_C} -%post -n libcolord-gtk1 -p /sbin/ldconfig -%postun -n libcolord-gtk1 -p /sbin/ldconfig +%ldconfig_scriptlets -n libcolord-gtk1 +%ldconfig_scriptlets -n libcolord-gtk4-1 %files lang -f %{name}.lang @@ -120,6 +134,9 @@ This package contains development documentation for the colord-gtk packages. %license COPYING %{_libdir}/libcolord-gtk.so.* +%files -n libcolord-gtk4-1 +%{_libdir}/libcolord-gtk4.so.* + %files -n typelib-1_0-ColordGtk-1_0 %{_libdir}/girepository-1.0/ColordGtk-1.0.typelib @@ -131,6 +148,8 @@ This package contains development documentation for the colord-gtk packages. %{_datadir}/gir-1.0/ColordGtk-1.0.gir %{_datadir}/vala/vapi/colord-gtk.vapi %{_datadir}/vala/vapi/colord-gtk.deps +%{_libdir}/libcolord-gtk4.so +%{_libdir}/pkgconfig/colord-gtk4.pc %files doc %doc AUTHORS NEWS README From 9efd53eec01ac1874576030dfab65afb56f5ba2d4528ab8a137bc1219051fdab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 22 Mar 2022 14:35:28 +0000 Subject: [PATCH 2/2] Accepting request 963908 from home:dimstar:Factory - Do not build libcolord-gtk4-1-32bit: there is no consumer and so far we avoid putting gtk4-32bit up. OBS-URL: https://build.opensuse.org/request/show/963908 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/colord-gtk?expand=0&rev=20 --- baselibs.conf | 1 - colord-gtk.changes | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/baselibs.conf b/baselibs.conf index 921b2b5..834de06 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1 @@ libcolord-gtk1 -libcolord-gtk4-1 diff --git a/colord-gtk.changes b/colord-gtk.changes index f169db2..50338c2 100644 --- a/colord-gtk.changes +++ b/colord-gtk.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 22 11:09:45 UTC 2022 - Dominique Leuenberger + +- Do not build libcolord-gtk4-1-32bit: there is no consumer and so + far we avoid putting gtk4-32bit up. + ------------------------------------------------------------------- Tue Feb 15 20:51:48 UTC 2022 - bjorn.lie@gmail.com