From fc067f606ed95e9abe8bf68e749f54564a92d992 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 5 Sep 2019 03:15:19 +0200 Subject: [PATCH] Update to 1.23.92 --- .gitignore | 1 + ...-build-Use-the-same-soname-as-1.22.x.patch | 29 ------------------- libpeas.spec | 10 ++++--- python3.8-fix.patch | 13 --------- sources | 2 +- 5 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 0001-build-Use-the-same-soname-as-1.22.x.patch delete mode 100644 python3.8-fix.patch diff --git a/.gitignore b/.gitignore index 877a7d5..aba2c78 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /libpeas-1.21.0.tar.xz /libpeas-1.22.0.tar.xz /libpeas-1.23.90.1.tar.xz +/libpeas-1.23.92.tar.xz diff --git a/0001-build-Use-the-same-soname-as-1.22.x.patch b/0001-build-Use-the-same-soname-as-1.22.x.patch deleted file mode 100644 index e04dfab..0000000 --- a/0001-build-Use-the-same-soname-as-1.22.x.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 784743e5e7a11b47d0495582044f89bb703f5e78 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Tue, 20 Aug 2019 15:57:57 +0200 -Subject: [PATCH] build: Use the same soname as 1.22.x - -The switch to meson inadvertently bumped soname. Switch it back to what -it was with the autotools build. - -https://gitlab.gnome.org/GNOME/libpeas/issues/31 ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index d4a481c..ddd0283 100644 ---- a/meson.build -+++ b/meson.build -@@ -30,7 +30,7 @@ endif - # Compatibility with libtool versioning: - # current = minor * 100 + micro - interface - # revision = interface --lib_version_soversion = version_major -+lib_version_soversion = 0 - lib_version_current = version_minor * 100 + version_micro - interface_age - lib_version_revision = interface_age - lib_version = '@0@.@1@.@2@'.format( --- -2.21.0 - diff --git a/libpeas.spec b/libpeas.spec index 939698b..4dc3b68 100644 --- a/libpeas.spec +++ b/libpeas.spec @@ -5,16 +5,14 @@ %global apiver 1.0 Name: libpeas -Version: 1.23.90.1 -Release: 2%{?dist} +Version: 1.23.92 +Release: 1%{?dist} Summary: Plug-ins implementation convenience library License: LGPLv2+ URL: https://wiki.gnome.org/Projects/Libpeas Source0: https://download.gnome.org/sources/%{name}/1.23/%{name}-%{version}.tar.xz -Patch0: 0001-build-Use-the-same-soname-as-1.22.x.patch - BuildRequires: gcc BuildRequires: gettext BuildRequires: gtk-doc @@ -67,6 +65,7 @@ that are needed to write applications that use libpeas. %build %meson \ + -Ddemos=false \ -Dvapi=true \ -Dgtk_doc=true @@ -111,6 +110,9 @@ that are needed to write applications that use libpeas. %{_datadir}/glade/catalogs/libpeas-gtk.xml %changelog +* Thu Sep 05 2019 Kalev Lember - 1.23.92-1 +- Update to 1.23.92 + * Tue Aug 20 2019 Kalev Lember - 1.23.90.1-2 - Revert inadvertent soname bump - Tighten spec file globs to avoid accidental soname bumps in the future diff --git a/python3.8-fix.patch b/python3.8-fix.patch deleted file mode 100644 index 91dd0dd..0000000 --- a/python3.8-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index bd561e2..45ac643 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -442,7 +442,7 @@ else - found_python3=yes - PYTHON3_BIN="$PYTHON" - PYTHON3_CFLAGS=`${PYTHON3_CONFIG} --includes` -- PYTHON3_LIBS=`${PYTHON3_CONFIG} --libs` -+ PYTHON3_LIBS=`${PYTHON3_CONFIG} --libs --embed` || PYTHON3_LIBS=`${PYTHON3_CONFIG} --libs` - PYTHON3_LDFLAGS=`${PYTHON3_CONFIG} --ldflags` - AC_SUBST(PYTHON3_BIN) - AC_SUBST(PYTHON3_CFLAGS) diff --git a/sources b/sources index 6a4bea7..e2c24bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpeas-1.23.90.1.tar.xz) = 91804a25aa39dd9d9f888170eb60cb06418ec96244619fdf6072d9b33a02a7d22946d6e2df07e6fdc4d394236165cf86c4686305d914f5edc47637910c99bb7d +SHA512 (libpeas-1.23.92.tar.xz) = 649bdebb54d1e5b4a9810ec79bac1a66b16e8190570ba557c1a5b3dd12c6a419f89d92175d7483992fd1d7ed0b06bb8d4a70978a2e4ff7bc22a750cb04827a3e