From a25c08382d888a8bc0f669520028728e25e705ab Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Wed, 12 Jan 2022 11:35:44 +0000
Subject: [PATCH] Update to 42.alpha

New subpackages for gtk4 version.
---
 .gitignore          |  1 +
 gnome-desktop3.spec | 58 ++++++++++++++++++++++++++++++++++++++++-----
 sources             |  2 +-
 3 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6c06393..3895ccc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -184,3 +184,4 @@ gnome-desktop-2.90.4.tar.bz2
 /gnome-desktop-41.1.tar.xz
 /gnome-desktop-41.2.tar.xz
 /gnome-desktop-41.3.tar.xz
+/gnome-desktop-42.alpha.tar.xz
diff --git a/gnome-desktop3.spec b/gnome-desktop3.spec
index 3591f97..4cc915a 100644
--- a/gnome-desktop3.spec
+++ b/gnome-desktop3.spec
@@ -1,5 +1,6 @@
 %global gdk_pixbuf2_version               2.36.5
 %global gtk3_version                      3.3.6
+%global gtk4_version                      4.4.0
 %global glib2_version                     2.53.0
 %global gsettings_desktop_schemas_version 3.27.0
 %global po_package                        gnome-desktop-3.0
@@ -7,13 +8,13 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name: gnome-desktop3
-Version: 41.3
+Version: 42~alpha
 Release: 1%{?dist}
 Summary: Library with common API for various GNOME modules
 
 License: GPLv2+ and LGPLv2+
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-desktop/41/gnome-desktop-%{tarball_version}.tar.xz
+Source0: http://download.gnome.org/sources/gnome-desktop/42/gnome-desktop-%{tarball_version}.tar.xz
 
 Source1: gnome-mimeapps.list
 # Generated with:
@@ -43,6 +44,7 @@ BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
 BuildRequires: pkgconfig(gobject-introspection-1.0)
 BuildRequires: pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_schemas_version}
 BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
+BuildRequires: pkgconfig(gtk4) >= %{gtk4_version}
 BuildRequires: pkgconfig(iso-codes)
 BuildRequires: pkgconfig(libseccomp)
 BuildRequires: pkgconfig(libudev)
@@ -63,7 +65,7 @@ Requires: gsettings-desktop-schemas >= %{gsettings_desktop_schemas_version}
 Conflicts: gnome-shell < 3.33.4
 
 %description
-gnome-desktop contains the libgnome-desktop library as well as a data
+gnome-desktop3 contains the libgnome-desktop library as well as a data
 file that exports the "GNOME" version to the Settings Details panel.
 
 The libgnome-desktop library provides API shared by several applications
@@ -81,6 +83,29 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+%package -n gnome-desktop4
+Summary: Library with common API for various GNOME modules
+License: GPLv2+ and LGPLv2+
+# Depend on base package for translations, help, version and mimeapps.
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description -n gnome-desktop4
+gnome-desktop4 contains the libgnome-desktop library.
+
+The libgnome-desktop library provides API shared by several applications
+on the desktop, but that cannot live in the platform for various
+reasons. There is no API or ABI guarantee, although we are doing our
+best to provide stability.
+
+%package -n gnome-desktop4-devel
+Summary: Libraries and headers for gnome-desktop4
+License: LGPLv2+
+Requires: gnome-desktop4%{?_isa} = %{version}-%{release}
+
+%description -n gnome-desktop4-devel
+The gnome-desktop4-devel package contains libraries and header files for
+developing applications that use gnome-desktop4.
+
 %package  tests
 Summary:  Tests for the %{name} package
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -119,19 +144,40 @@ cat %SOURCE5 >> $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-mimeapps.list
 %{_libexecdir}/gnome-desktop-debug/
 
 %files devel
-%{_libdir}/lib*.so
-%{_libdir}/pkgconfig/*
-%{_includedir}/*
+%{_libdir}/libgnome-desktop-3.so
+%{_libdir}/pkgconfig/gnome-desktop-3.0.pc
+%{_includedir}/gnome-desktop-3.0
 %{_datadir}/gir-1.0/GnomeDesktop-3.0.gir
 %dir %{_datadir}/gtk-doc/
 %dir %{_datadir}/gtk-doc/html/
 %doc %{_datadir}/gtk-doc/html/gnome-desktop3/
 
+%files -n gnome-desktop4
+%doc AUTHORS NEWS README.md
+%license COPYING COPYING.LIB
+# LGPL
+%{_libdir}/libgnome-bg-4.so.0
+%{_libdir}/libgnome-desktop-4.so.0
+%{_libdir}/libgnome-rr-4.so.0
+%{_libdir}/libgnome-bg-4.so.1{,.*}
+%{_libdir}/libgnome-desktop-4.so.1{,.*}
+%{_libdir}/libgnome-rr-4.so.1{,.*}
+%{_libdir}/girepository-1.0/Gnome*-4.0.typelib
+
+%files -n gnome-desktop4-devel
+%{_libdir}/libgnome-*-4.so
+%{_libdir}/pkgconfig/gnome-*-4.pc
+%{_includedir}/gnome-desktop-4.0
+%{_datadir}/gir-1.0/Gnome*-4.0.gir
+
 %files tests
 %{_libexecdir}/installed-tests/gnome-desktop
 %{_datadir}/installed-tests
 
 %changelog
+* Tue Jan 11 2022 David King <amigadave@amigadave.com> - 42~alpha-1
+- Update to 42.alpha
+
 * Tue Jan 11 2022 David King <amigadave@amigadave.com> - 41.3-1
 - Update to 41.3
 
diff --git a/sources b/sources
index 34d703b..c5430f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-desktop-41.3.tar.xz) = b02d9fe3bfad56993f9ed7225b38b4b0b685c7ad1480a9d9db5f9a6a8e13c16918d87e6a51160ee3101ab8ce24f4c0632ae351e7bb11cc473523e216ee9cf6bf
+SHA512 (gnome-desktop-42.alpha.tar.xz) = 3cb4935b512ce87bb5766cd73e1fe77fe07cae1407630b991e02b0195c8bb61a0ff52a324056c7b9e56017ef36bdc1fcea03f613372adf1bc4e048cbda41934e