diff --git a/0001-glade-Adapt-to-Glade-3.36-API-changes.patch b/0001-glade-Adapt-to-Glade-3.36-API-changes.patch deleted file mode 100644 index 784ed90..0000000 --- a/0001-glade-Adapt-to-Glade-3.36-API-changes.patch +++ /dev/null @@ -1,40 +0,0 @@ -From f9d3de79161396efed15147188d175f5a5f7e60f Mon Sep 17 00:00:00 2001 -From: Alberto Fanjul -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 - diff --git a/libhandy-1.2.0.tar.xz b/libhandy-1.2.0.tar.xz new file mode 100644 index 0000000..ce74490 Binary files /dev/null and b/libhandy-1.2.0.tar.xz differ diff --git a/libhandy-v0.0.13.tar.bz2 b/libhandy-v0.0.13.tar.bz2 deleted file mode 100644 index ce4d91a..0000000 Binary files a/libhandy-v0.0.13.tar.bz2 and /dev/null differ diff --git a/libhandy.spec b/libhandy.spec index d05fb37..24520c3 100644 --- a/libhandy.spec +++ b/libhandy.spec @@ -1,11 +1,10 @@ Name: libhandy -Version: 0.0.13 +Version: 1.2.0 Release: 1 Summary: Library with GTK+ widgets for mobile phones License: LGPLv2+ -URL: https://source.puri.sm/Librem5/libhandy/ -Source0: https://source.puri.sm/Librem5/libhandy/-/archive/v%{version}/libhandy-v%{version}.tar.bz2 -Patch0: 0001-glade-Adapt-to-Glade-3.36-API-changes.patch +URL: https://gitlab.gnome.org/GNOME/libhandy +Source0: https://download.gnome.org/sources/libhandy/1.2/libhandy-%{version}.tar.xz BuildRequires: gcc gtk-doc meson pkgconfig(gio-2.0) pkgconfig(gladeui-2.0) pkgconfig(glib-2.0) BuildRequires: pkgconfig(gmodule-2.0) pkgconfig(gobject-introspection-1.0) pkgconfig(gtk+-3.0) BuildRequires: vala @@ -21,7 +20,7 @@ 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 @@ -30,22 +29,29 @@ developing applications that use %{name}. %install %meson_install -%files +%find_lang libhandy libhandy.lang + +%files -f libhandy.lang %license COPYING %doc 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}/pkgconfig/libhandy-0.0.pc +%{_libdir}/libhandy-1.so +%{_libdir}/pkgconfig/libhandy-1.pc %{_datadir}/gir-1.0/ %{_datadir}/glade/ %{_datadir}/gtk-doc/ %{_datadir}/vala/ %changelog +* Fri May 28 2021 weijin deng - 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 - 0.0.13-1 - package init