From b2e1f94592e97677fbf6f8051a00524bb0ffa107 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sep 09 2019 19:06:36 +0000 Subject: Update to 0.0.11 --- diff --git a/.gitignore b/.gitignore index 8fa2626..7e76b91 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /libhandy-v0.0.8.tar.bz2 /libhandy-v0.0.9.tar.bz2 /libhandy-v0.0.10.tar.bz2 +/libhandy-v0.0.11.tar.bz2 diff --git a/fix-glade-installation-directories.patch b/fix-glade-installation-directories.patch deleted file mode 100644 index 69dab4a..0000000 --- a/fix-glade-installation-directories.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 09ed933fc4153602d343047abfdb450877b431f1 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Mon, 22 Jul 2019 11:13:10 -0500 -Subject: [PATCH] Don't install glade files outside build prefix - -When using pkg-config variables to get installation directory locations, -we must be careful to redefine any pkgconfig variables necessary to -ensure the installation does not occur outside the build prefix. We -could do, e.g.: - -module_dir = gladeui_dep.get_pkgconfig_variable( - 'moduledir', - define_variable: ['libdir', libdir)]) - -Except in the particular case of glade, this is not possible because the -pkg-config file uses absolute paths (i.e. the moduledir variable is not -relative to libdir, and not even relative to prefix!) so there's no way -to override it. This means we can't use the pkg-config directories at -all. - -If bored, fixing glade might be fun to do. In the meantime, we'll need -to install these manually. This fixes the files being installed under -/usr instead of /app when building a Fedora flatpak. ---- - glade/meson.build | 4 ++-- - meson.build | 1 + - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/glade/meson.build b/glade/meson.build -index 5351d7b..76a6552 100644 ---- a/glade/meson.build -+++ b/glade/meson.build -@@ -1,9 +1,9 @@ - if glade_catalog - - glade_xml = 'libhandy.xml' --module_dir = gladeui_dep.get_pkgconfig_variable('moduledir') -+module_dir = join_paths(libdir, 'glade', 'modules') - dtd = join_paths(meson.current_source_dir(), 'glade-catalog.dtd') --glade_catalogdir = gladeui_dep.get_pkgconfig_variable('catalogdir') -+glade_catalogdir = join_paths(datadir, 'glade', 'catalogs') - - libglade_hdy_sources = [ - 'glade-hdy-header-group.c', -diff --git a/meson.build b/meson.build -index 655ff9c..fe4c80b 100644 ---- a/meson.build -+++ b/meson.build -@@ -109,6 +109,7 @@ add_project_arguments( - - # Setup various paths that subdirectory meson.build files need - package_subdir = get_option('package_subdir') # When used as subproject -+datadir = join_paths(get_option('datadir'), package_subdir) - libdir = join_paths(get_option('libdir'), package_subdir) - girdir = join_paths(get_option('datadir'), package_subdir, 'gir-1.0') - typelibdir = join_paths(get_option('libdir'), package_subdir, 'girepository-1.0') --- -2.21.0 - diff --git a/libhandy.spec b/libhandy.spec index 720aac6..3d98f21 100644 --- a/libhandy.spec +++ b/libhandy.spec @@ -1,17 +1,12 @@ Name: libhandy -Version: 0.0.10 -Release: 3%{?dist} +Version: 0.0.11 +Release: 1%{?dist} 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 -# This is needed to use libhandy in Fedora flatpak builds. There's no -# upstream MR because I don't want to create an account on source.puri.sm. -# I've contacted the maintainer, Adrien, to let him know about this patch. -Patch0: fix-glade-installation-directories.patch - BuildRequires: gcc BuildRequires: gtk-doc BuildRequires: meson @@ -62,6 +57,9 @@ developing applications that use %{name}. %{_datadir}/vala/ %changelog +* Mon Sep 09 2019 Kalev Lember - 0.0.11-1 +- Update to 0.0.11 + * Thu Jul 25 2019 Fedora Release Engineering - 0.0.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index e36eb01..a780b59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libhandy-v0.0.10.tar.bz2) = 4f079a1e144f4454a04e696e591528f0a1f7a09e77dadd99f773b62f54a79dda176103b4cf26a8c92b95b90074d64442ce8b80141f7c891c31309ffbba9614b1 +SHA512 (libhandy-v0.0.11.tar.bz2) = 353afcb48b57ab7aedbf1849ee7b0abc9005a8607bb7417f561740c68fdaa174fbb1fb65a3f867f05444b581c4ba421ef0141305eac6d40eb30dbaf55c0d84a7