.gitignore

@@ -1 +1 @@
-SOURCES/libhandy-1.2.3.tar.xz
+SOURCES/libhandy-1.8.3.tar.xz

.libhandy.metadata

@@ -1 +1 @@
-3e475824d5502e88b0d65d099e4b4650218e1471 SOURCES/libhandy-1.2.3.tar.xz
+d78262cea1095323e665323c6d2a94168876f8ec SOURCES/libhandy-1.8.3.tar.xz

SPECS/libhandy.spec

@@ -1,27 +1,32 @@
+%bcond glade %[!(0%{?rhel} >= 10)]
+
 Name:           libhandy
-Version:        1.2.3
+Version:        1.8.3
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        Building blocks for modern adaptive GNOME apps
-License:        LGPLv2+
+License:        LGPL-2.1-or-later
 
 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
+Source0:        https://download.gnome.org/sources/%{name}/%{majmin}/%{name}-%{version}.tar.xz
 
 BuildRequires:  gcc
-BuildRequires:  gtk-doc
+BuildRequires:  gi-docgen
 BuildRequires:  meson
 BuildRequires:  vala
-
 BuildRequires:  pkgconfig(gio-2.0)
+%if %{with glade}
 BuildRequires:  pkgconfig(gladeui-2.0)
+%endif
 BuildRequires:  pkgconfig(glib-2.0) >= 2.44
 BuildRequires:  pkgconfig(gmodule-2.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.24.1
-
 # Support graphical tests in non-graphical environment
-BuildRequires:  xorg-x11-server-Xvfb
+BuildRequires:  xwayland-run
+BuildRequires:  mesa-dri-drivers
+BuildRequires:  mutter
+BuildRequires:  rsvg-pixbuf-loader
 
 # Retired in F34
 Obsoletes:      libhandy1 < 1.1.90-2
@@ -49,11 +54,15 @@ developing applications that use %{name}.
 
 
 %prep
-%autosetup -n libhandy-%{version} -p1
+%autosetup -p1
 
 
 %build
-%meson -Dgtk_doc=true -Dexamples=false -Dtests=true
+%meson -Dgtk_doc=true -Dexamples=false \
+%if %{without glade}
+    -Dglade_catalog=disabled \
+%endif
+    %{nil}
 %meson_build
 
 
@@ -64,42 +73,136 @@ developing applications that use %{name}.
 
 
 %check
-%{shrink:xvfb-run -a %meson_test}
+export NO_AT_BRIDGE=1
+%{shrink:xwfb-run -c mutter -- %meson_test}
 
 
 %files -f libhandy.lang
 %license COPYING
-%doc AUTHORS
+%doc AUTHORS HACKING.md NEWS README.md
-%doc HACKING.md
-%doc NEWS
-%doc README.md
-
 %{_libdir}/girepository-1.0/
 %{_libdir}/libhandy-1.so.0
 
 %files devel
 %{_includedir}/libhandy-1/
-
-%{_libdir}/glade/
 %{_libdir}/libhandy-1.so
 %{_libdir}/pkgconfig/libhandy-1.pc
-
 %{_datadir}/gir-1.0/
+%if %{with glade}
+%{_libdir}/glade/
 %{_datadir}/glade/
-%{_datadir}/gtk-doc/
+%endif
+%doc %{_datadir}/doc/libhandy-1/
 %{_datadir}/vala/
 
 
 %changelog
-* Tue Aug 24 2021 Kalev Lember <klember@redhat.com> - 1.2.3-1
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.8.3-4
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.8.3-3
+- Rebuilt for MSVSphere 10
+
+* Tue Jul 23 2024 Tomas Popela <tpopela@redhat.com> - 1.8.3-3
+- Move away from xvfb-run (done by nielsdg@redhat.com in Fedora)
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.8.3-2
+- Bump release for June 2024 mass rebuild
+
+* Fri Feb 09 2024 Kalev Lember <klember@redhat.com> - 1.8.3-1
+- Update to 1.8.3
+- Re-enable tests on s390x
+
+* Wed Feb 07 2024 Kalev Lember <klember@redhat.com> - 1.8.2-8
+- Migrate to SPDX license
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Dec 10 2023 Kalev Lember <klember@redhat.com> - 1.8.2-5
+- Backport an upstream patch to fix a write after free issue (rhbz#2253814)
+
+* Tue Oct 31 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.8.2-4
+- Disable glade catalog in RHEL builds
+
+* Tue Oct 24 2023 Yanko Kaneti <yaneti@declera.com> - 1.8.2-3
+- BR: rsvg-pixbuf-loader for svg support in tests
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Mar 04 2023 David King <amigadave@amigadave.com> - 1.8.2-1
+- Update to 1.8.2
+
+* Wed Feb 01 2023 David King <amigadave@amigadave.com> - 1.8.1-1
+- Update to 1.8.1 (#2166285)
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Sep 16 2022 Kalev Lember <klember@redhat.com> - 1.8.0-1
+- Update to 1.8.0
+
+* Mon Aug 08 2022 Kalev Lember <klember@redhat.com> - 1.7.90-1
+- Update to 1.7.90
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jul 12 2022 Kalev Lember <klember@redhat.com> - 1.7.0-1
+- Update to 1.7.0
+
+* Sun Apr 24 2022 David King <amigadave@amigadave.com> - 1.6.2-1
+- Update to 1.6.2 (#2022621)
+
+* Fri Mar 18 2022 David King <amigadave@amigadave.com> - 1.6.1-1
+- Update to 1.6.1
+
+* Fri Mar 18 2022 David King <amigadave@amigadave.com> - 1.6.0-1
+- Update to 1.6.0
+
+* Tue Mar 08 2022 David King <amigadave@amigadave.com> - 1.5.91-1
+- Update to 1.5.91
+
+* Sun Feb 13 2022 David King <amigadave@amigadave.com> - 1.5.90-1
+- Update to 1.5.90
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Sat Dec 11 2021 Kalev Lember <klember@redhat.com> - 1.5.0-2
+- Backport an upstream patch to fix swipe-tracker criticals
+
+* Sat Nov 13 2021 Kalev Lember <klember@redhat.com> - 1.5.0-1
+- Update to 1.5.0
+
+* Wed Sep 08 2021 Kalev Lember <klember@redhat.com> - 1.4.0-1
+- Update to 1.4.0
+
+* Mon Aug 16 2021 Kalev Lember <klember@redhat.com> - 1.3.90-1
+- Update to 1.3.90
+
+* Fri Jul 30 2021 Yanko Kaneti <yaneti@declera.com> - 1.2.3-3
+- Delay xvfb-run test run in an attempt to fix FTBFS
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jun 21 2021 Kalev Lember <klember@redhat.com> - 1.2.3-1
 - Update to 1.2.3
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.0-4
+* Tue Apr 27 2021 Kalev Lember <klember@redhat.com> - 1.2.2-1
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Update to 1.2.2
-  Related: rhbz#1991688
+
+* Mon Apr 19 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 1.2.1-2
+- Add patch to fix Geary crashes
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.0-3
+* Tue Apr 13 2021 Kalev Lember <klember@redhat.com> - 1.2.1-1
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Update to 1.2.1
 
 * Fri Mar 19 2021 Kalev Lember <klember@redhat.com> - 1.2.0-2
 - Add conflicts with libhandy1 packages to help with the upgrade path