From 863f3451ce1059bea4cb9f22d3d39372feccea11 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Mon, 29 Mar 2021 16:42:17 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/libhandy.git#f38a0a9f584a3c46bbc560b88ad1538e41ac3084
---
 .gitignore    |  2 ++
 libhandy.spec | 79 ++++++++++++++++++++++++++++++++++++++++-----------
 sources       |  2 +-
 3 files changed, 66 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index daf2fcb..02f246c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@
 /libhandy-v0.0.10.tar.bz2
 /libhandy-v0.0.11.tar.bz2
 /libhandy-v0.0.13.tar.bz2
+/libhandy-1.1.90.tar.xz
+/libhandy-1.2.0.tar.xz
diff --git a/libhandy.spec b/libhandy.spec
index f6c0bd3..a3695e6 100644
--- a/libhandy.spec
+++ b/libhandy.spec
@@ -1,59 +1,106 @@
 Name:           libhandy
-Version:        0.0.13
-Release:        7%{?dist}
-Summary:        Library with GTK+ widgets for mobile phones
-
+Version:        1.2.0
+Release:        2%{?dist}
+Summary:        Building blocks for modern adaptive GNOME apps
 License:        LGPLv2+
-URL:            https://source.puri.sm/Librem5/libhandy/
-Source0:        https://source.puri.sm/Librem5/libhandy/-/archive/v%{version}/libhandy-v%{version}.tar.bz2
+
+URL:            https://gitlab.gnome.org/GNOME/libhandy
+%global majmin %(echo %{version} | cut -d . -f -2)
+Source0:        https://download.gnome.org/sources/libhandy/%{majmin}/libhandy-%{version}.tar.xz
 
 BuildRequires:  gcc
 BuildRequires:  gtk-doc
 BuildRequires:  meson
+BuildRequires:  vala
+
 BuildRequires:  pkgconfig(gio-2.0)
-BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gladeui-2.0)
+BuildRequires:  pkgconfig(glib-2.0) >= 2.44
 BuildRequires:  pkgconfig(gmodule-2.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
-BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  vala
+BuildRequires:  pkgconfig(gtk+-3.0) >= 3.24.1
+
+# Support graphical tests in non-graphical environment
+BuildRequires:  xorg-x11-server-Xvfb
+
+# Retired in F34
+Obsoletes:      libhandy1 < 1.1.90-2
+Conflicts:      libhandy1 < 1.1.90-2
+Provides:       libhandy1 = %{version}-%{release}
+Provides:       libhandy1%{?_isa} = %{version}-%{release}
 
 %description
 libhandy provides GTK+ widgets and GObjects to ease developing
 applications for mobile phones.
 
+
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+# Retired in F34
+Obsoletes:      libhandy1-devel < 1.1.90-2
+Conflicts:      libhandy1-devel < 1.1.90-2
+Provides:       libhandy1-devel = %{version}-%{release}
+Provides:       libhandy1-devel%{?_isa} = %{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+
 %prep
-%autosetup -n libhandy-v%{version} -p1
+%autosetup -n libhandy-%{version} -p1
+
 
 %build
-%meson -Dgtk_doc=true -Dexamples=false -Dglade_catalog=disabled
+%meson -Dgtk_doc=true -Dexamples=false -Dtests=true
 %meson_build
 
+
 %install
 %meson_install
 
-%files
+%find_lang libhandy
+
+
+%check
+%{shrink:xvfb-run -a %meson_test}
+
+
+%files -f libhandy.lang
 %license COPYING
+%doc AUTHORS
+%doc HACKING.md
+%doc NEWS
 %doc README.md
+
 %{_libdir}/girepository-1.0/
-%{_libdir}/libhandy-0.0.so.0*
+%{_libdir}/libhandy-1.so.0
 
 %files devel
-%{_includedir}/libhandy-0.0/
-%{_libdir}/libhandy-0.0.so
-%{_libdir}/pkgconfig/libhandy-0.0.pc
+%{_includedir}/libhandy-1/
+
+%{_libdir}/glade/
+%{_libdir}/libhandy-1.so
+%{_libdir}/pkgconfig/libhandy-1.pc
+
 %{_datadir}/gir-1.0/
+%{_datadir}/glade/
 %{_datadir}/gtk-doc/
 %{_datadir}/vala/
 
+
 %changelog
+* Fri Mar 19 2021 Kalev Lember <klember@redhat.com> - 1.2.0-2
+- Add conflicts with libhandy1 packages to help with the upgrade path
+
+* Mon Mar 15 2021 Kalev Lember <klember@redhat.com> - 1.2.0-1
+- Update to 1.2.0
+
+* Wed Mar 03 2021 Kalev Lember <klember@redhat.com> - 1.1.90-2
+- Update to 1.1.90 and libhandy 1 ABI, based on earlier libhandy1 packaging
+- Obsolete separate libhandy1 and libhandy1-devel packages
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.13-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 769e3ea..c194d13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libhandy-v0.0.13.tar.bz2) = a0918c55c9ac14af223a83db542e7dc815d97c844d1f0830a1bee4bdcdf248d00d049fa90fd2be96265535a68d56de5143ddd9264b5e997a902ac9558d5096f3
+SHA512 (libhandy-1.2.0.tar.xz) = 34f84479fcef6fdd3b46a03a0b4806887708ce8295461eae655e34febdec5b62de56e34e58696545f086be8de1e2c0ac13a61a4bbe0a945a87e7d8e860a5f919