!9 Upgrade to version 1.8.2

From: @chen-jan 
Reviewed-by: @caodongxia, @Lostwayzxc 
Signed-off-by: @caodongxia

0001-glade-Adapt-to-Glade-3.36-API-changes.patch

@@ -1,40 +0,0 @@
-From f9d3de79161396efed15147188d175f5a5f7e60f Mon Sep 17 00:00:00 2001
-From: Alberto Fanjul <albertofanjul@gmail.com>
-Date: Thu, 7 May 2020 12:43:51 +0200
-Subject: [PATCH] glade: Adapt to Glade 3.36 API changes
-
-Fixes https://source.puri.sm/Librem5/libhandy/issues/267.
----
- glade/glade-hdy-header-group.c | 2 +-
- glade/glade-hdy-swipe-group.c  | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/glade/glade-hdy-header-group.c b/glade/glade-hdy-header-group.c
-index be6a9de..aa83c6b 100644
---- a/glade/glade-hdy-header-group.c
-+++ b/glade/glade-hdy-header-group.c
-@@ -43,7 +43,7 @@ glade_hdy_header_group_read_widgets (GladeWidget *widget, GladeXmlNode *node)
-         string = widget_name;
-       } else if (widget_name != NULL) {
-         tmp =
--          g_strdup_printf ("%s%s%s", string, GPC_OBJECT_DELIMITER,
-+          g_strdup_printf ("%s%s%s", string, GLADE_PROPERTY_DEF_OBJECT_DELIMITER,
-                            widget_name);
-         string = (g_free (string), tmp);
-         g_free (widget_name);
-diff --git a/glade/glade-hdy-swipe-group.c b/glade/glade-hdy-swipe-group.c
-index 0b42798..ff909b0 100644
---- a/glade/glade-hdy-swipe-group.c
-+++ b/glade/glade-hdy-swipe-group.c
-@@ -45,7 +45,7 @@ glade_hdy_swipe_group_read_widgets (GladeWidget  *widget,
-         string = widget_name;
-       } else if (widget_name != NULL) {
-         tmp =
--          g_strdup_printf ("%s%s%s", string, GPC_OBJECT_DELIMITER,
-+          g_strdup_printf ("%s%s%s", string, GLADE_PROPERTY_DEF_OBJECT_DELIMITER,
-                            widget_name);
-         string = (g_free (string), tmp);
-         g_free (widget_name);
--- 
-2.26.2
-

libhandy.spec

@@ -1,51 +1,91 @@
+%global majmin %(echo %{version} | cut -d . -f -2)
+
 Name:                libhandy
-Version:             0.0.13
+Version:             1.8.2
 Release:             1
 Summary:             Library with GTK+ widgets for mobile phones
 License:             LGPLv2+
-URL:                 https://source.puri.sm/Librem5/libhandy/
+URL:                 https://gitlab.gnome.org/GNOME/libhandy
-Source0:             https://source.puri.sm/Librem5/libhandy/-/archive/v%{version}/libhandy-v%{version}.tar.bz2
+Source0:             https://download.gnome.org/sources/libhandy/%{majmin}/libhandy-%{version}.tar.xz
-Patch0:              0001-glade-Adapt-to-Glade-3.36-API-changes.patch
+
-BuildRequires:       gcc gtk-doc meson pkgconfig(gio-2.0) pkgconfig(gladeui-2.0) pkgconfig(glib-2.0)
+BuildRequires:       gcc meson vala gi-docgen
-BuildRequires:       pkgconfig(gmodule-2.0) pkgconfig(gobject-introspection-1.0) pkgconfig(gtk+-3.0)
+BuildRequires:       pkgconfig(gio-2.0) pkgconfig(gladeui-2.0) pkgconfig(glib-2.0) >= 2.44
-BuildRequires:       vala
+BuildRequires:       pkgconfig(gmodule-2.0) pkgconfig(gobject-introspection-1.0) pkgconfig(gtk+-3.0) >= 3.24.1
+BuildRequires:       xorg-x11-server-Xvfb
+
+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
+%package             devel
 Summary:             Development files for %{name}
 Requires:            %{name}%{?_isa} = %{version}-%{release}
-%description    devel
+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}
 
 %build
-%meson -Dgtk_doc=true -Dexamples=false
+%meson -Dgtk_doc=true -Dexamples=false \
+       -Dtests=true
 %meson_build
 
 %install
 %meson_install
 
-%files
+%find_lang libhandy 
+
+%check
+# No parallel test runs to try to avoid overwhellming Xvfb on some platforms
+%define _smp_build_ncpus 1
+%{shrink:xvfb-run -w 10 -d %meson_test}
+
+%files -f libhandy.lang
 %license COPYING
-%doc README.md
+%doc AUTHORS HACKING.md NEWS README.md
 %{_libdir}/girepository-1.0/
-%{_libdir}/libhandy-0.0.so.0*
+%{_libdir}/libhandy-1.so.0
 
 %files devel
-%{_includedir}/libhandy-0.0/
+%{_includedir}/libhandy-1/
 %{_libdir}/glade/
-%{_libdir}/libhandy-0.0.so
+%{_libdir}/libhandy-1.so
-%{_libdir}/pkgconfig/libhandy-0.0.pc
+%{_libdir}/pkgconfig/libhandy-1.pc
 %{_datadir}/gir-1.0/
 %{_datadir}/glade/
-%{_datadir}/gtk-doc/
+%doc %{_datadir}/doc/libhandy-1/
 %{_datadir}/vala/
 
+
 %changelog
+* Thu Sep 14 2023 chenchen <chen_aka_jan@163.com> - 1.8.2-1
+- Upgrade to version 1.8.2
+
+* Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 1.8.0-1
+- Update to 1.8.0
+
+* Mon Jun 6 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 1.6.2-1
+- Update to 1.6.2
+
+* Mon Mar 28 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 1.6.1-1
+- Update to 1.6.1
+
+* Fri May 28 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 1.2.0-1
+- Upgrade to 1.2.0
+- Update Version, URL, Source0. delete Patch0. update stage 'prep'
+- Add 'find_lang', update stage 'files'
+
 * Thu Nov 5 2020 Liu wei bo <liuweibo10@huawei.com> - 0.0.13-1
 - package init

libhandy.yaml

@@ -1,4 +1,4 @@
 version_control: gitlab.gnome
 src_repo: libhandy
 tag_prefix: ""
-seperator: "."
+separator: "."