From c96d59fb125e182021a4af993580675f90707411 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 19 Jul 2022 11:59:35 +0200
Subject: [PATCH] Update to 3.90.0; Split subpackages for gtk3 and gtk4

---
 .gitignore |  53 +-----------------
 gcr.spec   | 161 ++++++++++++++++++++++++++++++++++-------------------
 sources    |   2 +-
 3 files changed, 106 insertions(+), 110 deletions(-)

diff --git a/.gitignore b/.gitignore
index 749a66c..3dd1772 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,52 +1 @@
-/gcr-3.3.3.1.tar.xz
-/gcr-3.3.4.tar.xz
-/gcr-3.3.5.tar.xz
-/gcr-3.3.90.tar.xz
-/gcr-3.3.92.tar.xz
-/gcr-3.4.0.tar.xz
-/gcr-3.4.1.tar.xz
-/gcr-3.5.3.tar.xz
-/gcr-3.5.4.tar.xz
-/gcr-3.5.5.tar.xz
-/gcr-3.5.90.tar.xz
-/gcr-3.5.92.tar.xz
-/gcr-3.6.0.tar.xz
-/gcr-3.6.1.tar.xz
-/gcr-3.7.1.tar.xz
-/gcr-3.7.2.tar.xz
-/gcr-3.7.5.tar.xz
-/gcr-3.7.91.tar.xz
-/gcr-3.7.92.tar.xz
-/gcr-3.8.0.tar.xz
-/gcr-3.8.1.tar.xz
-/gcr-3.9.1.tar.xz
-/gcr-3.9.90.tar.xz
-/gcr-3.9.91.tar.xz
-/gcr-3.10.0.tar.xz
-/gcr-3.10.1.tar.xz
-/gcr-3.11.91.tar.xz
-/gcr-3.12.0.tar.xz
-/gcr-3.12.2.tar.xz
-/gcr-3.13.91.tar.xz
-/gcr-3.14.0.tar.xz
-/gcr-3.15.90.tar.xz
-/gcr-3.15.92.tar.xz
-/gcr-3.16.0.tar.xz
-/gcr-3.17.4.tar.xz
-/gcr-3.18.0.tar.xz
-/gcr-3.19.4.tar.xz
-/gcr-3.20.0.tar.xz
-/gcr-3.27.92.tar.xz
-/gcr-3.28.0.tar.xz
-/gcr-3.28.1.tar.xz
-/gcr-3.33.4.tar.xz
-/gcr-3.34.0.tar.xz
-/gcr-3.35.1.tar.xz
-/gcr-3.35.90.tar.xz
-/gcr-3.35.91.tar.xz
-/gcr-3.36.0.tar.xz
-/gcr-3.37.91.tar.xz
-/gcr-3.38.0.tar.xz
-/gcr-3.38.1.tar.xz
-/gcr-3.40.0.tar.xz
-/gcr-3.41.0.tar.xz
+/gcr-*.tar.xz
diff --git a/gcr.spec b/gcr.spec
index 394c6eb..6209de6 100644
--- a/gcr.spec
+++ b/gcr.spec
@@ -3,26 +3,25 @@
 %endif
 
 Name:           gcr
-Version:        3.41.0
-Release:        2%{?dist}
+Version:        3.90.0
+Release:        1%{?dist}
 Summary:        A library for bits of crypto UI and parsing
 
 License:        LGPLv2+
 URL:            https://wiki.gnome.org/Projects/CryptoGlue
-Source0:        https://download.gnome.org/sources/%{name}/3.41/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/%{name}/3.90/%{name}-%{version}.tar.xz
 
 BuildRequires:  gettext
-BuildRequires:  gtk-doc
 BuildRequires:  meson
+BuildRequires:  pkgconfig(gi-docgen)
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(gtk4)
 BuildRequires:  pkgconfig(libsecret-1)
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(p11-kit-1)
-BuildRequires:  docbook-style-xsl
 BuildRequires:  libgcrypt-devel
-BuildRequires:  desktop-file-utils
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  vala
 %if 0%{?has_valgrind}
@@ -44,19 +43,53 @@ desktop.
 
 gck is a library for accessing PKCS#11 modules like smart cards.
 
-%package devel
-Summary: Development files for gcr
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description devel
-The gcr-devel package includes the header files for the gcr library.
-
 %package base
-Summary: Library files for gcr
+Summary: Common library files for %{name}
 Conflicts: %{name} < 3.28.1-3
 
 %description base
-The gcr-base package includes the gcr-base library.
+The %{name}-base package includes the %{name} common library files used by both gtk3 and gtk4 versions.
+
+%package gtk3
+Summary: Library files for %{name} using gtk3
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-base%{?_isa} = %{version}-%{release}
+
+%description gtk3
+The %{name}-gtk3 package includes the library files for the %{name} package using gtk3.
+
+%package gtk4
+Summary: Library files for %{name} using gtk4
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-base%{?_isa} = %{version}-%{release}
+
+%description gtk4
+The %{name}-gtk4 package includes the library files for the %{name} package using gtk4.
+
+%package devel
+Summary: Common development files for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+The %{name}-devel package includes the common header files for the %{name} library.
+
+%package gtk3-devel
+Summary: Development files for %{name} using gtk3
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-gtk3%{?_isa} = %{version}-%{release}
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
+
+%description gtk3-devel
+The %{name}-gtk3-devel package includes the header files for the %{name} library using gtk3.
+
+%package gtk4-devel
+Summary: Development files for %{name} using gtk4
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-gtk4%{?_isa} = %{version}-%{release}
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
+
+%description gtk4-devel
+The %{name}-gtk4-devel package includes the header files for the %{name} library using gtk4.
 
 %prep
 %autosetup -p1
@@ -65,15 +98,9 @@ The gcr-base package includes the gcr-base library.
 %meson
 %meson_build
 
-
 %install
 %meson_install
-%find_lang %{name}
-
-
-%check
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop
-
+%find_lang %{name}-4
 
 %post
 %systemd_user_post gcr-ssh-agent.service
@@ -85,51 +112,71 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop
 %systemd_user_postun_with_restart gcr-ssh-agent.service
 
 
-%files -f %{name}.lang
+%files -f %{name}-4.lang
 %doc NEWS README.md
 %license COPYING
-%{_bindir}/gcr-viewer
-%{_datadir}/applications/gcr-viewer.desktop
-%dir %{_datadir}/GConf
-%dir %{_datadir}/GConf/gsettings
-%{_datadir}/GConf/gsettings/org.gnome.crypto.pgp.convert
-%{_datadir}/GConf/gsettings/org.gnome.crypto.pgp_keyservers.convert
-%{_datadir}/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml
 %{_libdir}/girepository-1.0
-%{_libdir}/libgcr-ui-3.so.1*
-%{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/mime/packages/gcr-crypto-types.xml
-%{_libexecdir}/gcr-prompter
 %{_libexecdir}/gcr-ssh-agent
-%{_libexecdir}/gcr-ssh-askpass
-%{_datadir}/dbus-1/services/org.gnome.keyring.PrivatePrompter.service
-%{_datadir}/dbus-1/services/org.gnome.keyring.SystemPrompter.service
-%{_datadir}/applications/gcr-prompter.desktop
+%{_libexecdir}/gcr4-ssh-askpass
 %{_userunitdir}/gcr-ssh-agent.service
 %{_userunitdir}/gcr-ssh-agent.socket
 
-%files devel
-%{_includedir}/gck-1
-%{_includedir}/gcr-3
-%{_libdir}/libgck-1.so
-%{_libdir}/libgcr-base-3.so
-%{_libdir}/libgcr-ui-3.so
-%{_libdir}/pkgconfig/gck-1.pc
-%{_libdir}/pkgconfig/gcr-3.pc
-%{_libdir}/pkgconfig/gcr-base-3.pc
-%{_libdir}/pkgconfig/gcr-ui-3.pc
-%{_datadir}/gir-1.0
-%dir %{_datadir}/gtk-doc
-%dir %{_datadir}/gtk-doc/html
-%{_datadir}/gtk-doc/html/gck
-%{_datadir}/gtk-doc/html/gcr
-%{_datadir}/vala/
-
 %files base
-%{_libdir}/libgck-1.so.0*
-%{_libdir}/libgcr-base-3.so.1*
+%{_libdir}/libgck-2.so.1.90.0
+%{_libdir}/libgck-2.so.0.0.0
+%{_libdir}/libgcr-4.so.3.90.0
+%{_libdir}/libgcr-4.so.0.0.0
+
+%files gtk3
+%{_libdir}/libgcr-4-gtk3.so.0.0.0
+%{_libdir}/libgcr-4-gtk3.so.3.90.0
+
+%files gtk4
+%{_libdir}/libgcr-4-gtk4.so.0.0.0
+%{_libdir}/libgcr-4-gtk4.so.3.90.0
+
+%files devel
+%{_includedir}/gck-2
+%{_includedir}/gcr-4/gcr
+%{_libdir}/libgck-2.so
+%{_libdir}/libgcr-4.so
+%{_libdir}/pkgconfig/gck-2.pc
+%{_libdir}/pkgconfig/gcr-4.pc
+%{_datadir}/gir-1.0/Gck-2.gir
+%{_datadir}/gir-1.0/Gcr-4.gir
+%dir %{_datadir}/doc
+%{_datadir}/doc/gck-2
+%{_datadir}/doc/gcr-4
+%{_datadir}/vala/vapi/gck-2.deps
+%{_datadir}/vala/vapi/gck-2.vapi
+%{_datadir}/vala/vapi/gcr-4.deps
+%{_datadir}/vala/vapi/gcr-4.vapi
+
+%files gtk3-devel
+%{_bindir}/gcr-viewer-gtk3
+%{_datadir}/doc/gcr-4-gtk3
+%{_datadir}/gir-1.0/GcrGtk3-4.gir
+%{_datadir}/vala/vapi/gcr-4-gtk3.deps
+%{_datadir}/vala/vapi/gcr-4-gtk3.vapi
+%{_includedir}/gcr-4/gcr-gtk3
+%{_libdir}/libgcr-4-gtk3.so
+%{_libdir}/pkgconfig/gcr-4-gtk3.pc
+
+%files gtk4-devel
+%{_bindir}/gcr-viewer-gtk4
+%{_datadir}/doc/gcr-4-gtk4
+%{_datadir}/gir-1.0/GcrGtk4-4.gir
+%{_datadir}/vala/vapi/gcr-4-gtk4.deps
+%{_datadir}/vala/vapi/gcr-4-gtk4.vapi
+%{_includedir}/gcr-4/gcr-gtk4
+%{_libdir}/libgcr-4-gtk4.so
+%{_libdir}/pkgconfig/gcr-4-gtk4.pc
 
 %changelog
+* Tue Jul 19 2022 Milan Crha <mcrha@redhat.com> - 3.90.0-1
+- Update to 3.90.0
+- Split subpackages for gtk3 and gtk4
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.41.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index 9f42ead..25e937c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gcr-3.41.0.tar.xz) = 455acc40ed77feeb35f9845b00229f468b322b7eda0b1b5abb0153f0a6ba29f3d0364df22225143f4caf130254a1258b3c7f934370e5142f2f64e1c3084b6f6e
+SHA512 (gcr-3.90.0.tar.xz) = 20c199b0bc9925ad6b2abc2b54db1a2ae1afbbf0ac5b7ef86b1450b84af300cd8ec42a826294c62eca07f0ac55ca4018e9d75ec28e33353acc4598a0fee853ed