Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libpeas for openSUSE:Factory checked in at 2022-02-11 23:07:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpeas (Old) and /work/SRC/openSUSE:Factory/.libpeas.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libpeas" Fri Feb 11 23:07:01 2022 rev:47 rq:952956 version:1.30.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libpeas/libpeas.changes 2021-11-15 00:06:52.979628330 +0100 +++ /work/SRC/openSUSE:Factory/.libpeas.new.1956/libpeas.changes 2022-02-11 23:07:55.334691274 +0100 @@ -1,0 +2,20 @@ +Tue Feb 8 21:42:18 UTC 2022 - Bj??rn Lie <[email protected]> + +- Add upstream bug fix patches: + + a9d2ba590641d832dcf6b97184687b6eb424c00f.patch: icons: Update + icon licenses + + dfc763c16c0ce66a180ccb13205f1ca9666278a8.patch: icons: Correct + icon licenses again + + 2a976339f444d70f10949901a6ee2b1f8ccb24b6.patch: Build: add + embedded-resources.h to libembedded_dep +- Use ldconfig_scriptlets macro for post(un) handling. +- Update our Supplements to current standard. +- Stop removing no longer exisiting la files, not present after the + switch to meson build system. +- Stop packaging the demo files/sub-package, pass demos=false to + meson, and add libpeas-demo Obsolets to main lib. +- Remove all traces of already disabled via bcond + libpeas-loader-python sub-package, there is no chance we will + package that again. + +------------------------------------------------------------------- New: ---- 2a976339f444d70f10949901a6ee2b1f8ccb24b6.patch a9d2ba590641d832dcf6b97184687b6eb424c00f.patch dfc763c16c0ce66a180ccb13205f1ca9666278a8.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpeas.spec ++++++ --- /var/tmp/diff_new_pack.fhUe3K/_old 2022-02-11 23:08:00.086704474 +0100 +++ /var/tmp/diff_new_pack.fhUe3K/_new 2022-02-11 23:08:00.094704496 +0100 @@ -1,7 +1,7 @@ # # spec file for package libpeas # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,6 @@ %bcond_with lua51 -%bcond_with python2 %bcond_without python3 Name: libpeas Version: 1.30.0 @@ -27,6 +26,12 @@ Group: Development/Libraries/GNOME URL: https://wiki.gnome.org/Projects/Libpeas Source0: https://download.gnome.org/sources/libpeas/1.30/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM a9d2ba590641d832dcf6b97184687b6eb424c00f.patch -- icons: Update icon licenses +Patch0: https://gitlab.gnome.org/GNOME/libpeas/-/commit/a9d2ba590641d832dcf6b97184687b6eb424c00f.patch +# PATCH-FIX-UPSTREAM dfc763c16c0ce66a180ccb13205f1ca9666278a8.patch -- icons: Correct icon licenses again +Patch1: https://gitlab.gnome.org/GNOME/libpeas/-/commit/dfc763c16c0ce66a180ccb13205f1ca9666278a8.patch +# PATCH-FIX-UPSTREAM 2a976339f444d70f10949901a6ee2b1f8ccb24b6.patch -- Build: add embedded-resources.h to libembedded_dep +Patch2: https://gitlab.gnome.org/GNOME/libpeas/-/commit/2a976339f444d70f10949901a6ee2b1f8ccb24b6.patch BuildRequires: gettext BuildRequires: gtk-doc @@ -38,9 +43,6 @@ BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.39.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.0 BuildRequires: pkgconfig(pygobject-3.0) >= 3.0.0 -%if %{with python2} -BuildRequires: pkgconfig(python2) >= 2.5.2 -%endif %if %{with python3} BuildRequires: pkgconfig(python3) >= 3.2.0 %endif @@ -62,6 +64,8 @@ # The gjs loader is officially no longer supported upstream (removed from git). # With gjs moving to mozjs-24, it also fails building; so we follow upstream. Obsoletes: %{name}-loader-gjs <= %{version} +# Stop packaging the demo sub-package +Obsoletes: %{name}-demo <= %{version} %description -n libpeas-1_0-0 libpeas is a gobject-based plugin engine, and is targetted at giving @@ -97,21 +101,10 @@ This package provides the GObject Introspection bindings for the libpeas-gtk library. -%package loader-python -Summary: Python2 runtime loader for libpeas -Group: System/Libraries -Supplements: packageand(libpeas-1_0-0:python) - -%description loader-python -libpeas is a gobject-based plugin engine, and is targetted at giving -every application the chance to assume its own extensibility. - -This package contains the python loader. - %package loader-python3 Summary: Python3 runtime loader for libpeas Group: System/Libraries -Supplements: packageand(libpeas-1_0-0:python3) +Supplements: (libpeas-1_0-0 and python3) %description loader-python3 libpeas is a gobject-based plugin engine, and is targetted at giving @@ -132,20 +125,12 @@ This package contains the LUA 5.1 loader. %endif -%package demo -Summary: Demo applications from the libpeas package -Group: Development/Tools/Other - -%description demo -libpeas is a gobject-based plugin engine, and is targetted at giving -every application the chance to assume its own extensibility. - %package -n glade-catalog-libpeas Summary: Glade catalog for libpeas, a GObject-based plugin engine Group: Development/Tools/GUI Builders Requires: glade Requires: libpeas-gtk-1_0-0 = %{version} -Supplements: packageand(glade:%{name}-devel) +Supplements: (glade and %{name}-devel) %description -n glade-catalog-libpeas libpeas is a gobject-based plugin engine, and is targetted at giving @@ -174,6 +159,7 @@ %build %meson \ -Dgtk_doc=true \ + -Ddemos=false \ %if !%{with lua51} -Dlua51=false \ %endif @@ -185,13 +171,10 @@ %install %meson_install -find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name}-1.0 %{?no_lang_C} -%post -n libpeas-1_0-0 -p /sbin/ldconfig -%postun -n libpeas-1_0-0 -p /sbin/ldconfig -%post -n libpeas-gtk-1_0-0 -p /sbin/ldconfig -%postun -n libpeas-gtk-1_0-0 -p /sbin/ldconfig +%ldconfig_scriptlets -n libpeas-1_0-0 +%ldconfig_scriptlets -n libpeas-gtk-1_0-0 %files -n libpeas-1_0-0 %license COPYING @@ -211,11 +194,6 @@ %files -n typelib-1_0-PeasGtk-1_0 %{_libdir}/girepository-1.0/PeasGtk-1.0.typelib -%if %{with python2} -%files loader-python -%{_libdir}/libpeas-1.0/loaders/libpythonloader.so -%endif - %if %{with python3} %files loader-python3 %{_libdir}/libpeas-1.0/loaders/libpython3loader.so @@ -226,10 +204,6 @@ %{_libdir}/libpeas-1.0/loaders/liblua51loader.so %endif -%files demo -%{_bindir}/peas-demo -%{_libdir}/peas-demo/ - %files -n glade-catalog-libpeas %{_datadir}/glade/catalogs/libpeas-gtk.xml ++++++ 2a976339f444d70f10949901a6ee2b1f8ccb24b6.patch ++++++ >From 2a976339f444d70f10949901a6ee2b1f8ccb24b6 Mon Sep 17 00:00:00 2001 From: Christian Hergert <[email protected]> Date: Tue, 18 Jan 2022 14:43:29 -0800 Subject: [PATCH] build: add embedded-resources.h to libembedded_dep Fixes #42 --- tests/libpeas/plugins/embedded/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/libpeas/plugins/embedded/meson.build b/tests/libpeas/plugins/embedded/meson.build index 00232bf9..675eccd3 100644 --- a/tests/libpeas/plugins/embedded/meson.build +++ b/tests/libpeas/plugins/embedded/meson.build @@ -45,6 +45,7 @@ libembedded_lib = shared_library( ) libembedded_dep = declare_dependency( + sources: libembedded_res[1], link_with: libembedded_lib, include_directories: include_directories('.'), dependencies: libembedded_deps, -- GitLab ++++++ a9d2ba590641d832dcf6b97184687b6eb424c00f.patch ++++++ >From a9d2ba590641d832dcf6b97184687b6eb424c00f Mon Sep 17 00:00:00 2001 From: Bastien Nocera <[email protected]> Date: Fri, 11 Jun 2021 12:21:09 +0200 Subject: [PATCH] icons: Update icon licenses The libpeas-plugin icons were imported from a GPLv2+ application and were thus GPLv2+ license. This license is not compatible with libpeas' LGPLv2.1+ license for anything but GPL applications. Re-license the SVG files under the same license as the library itself. --- data/icons/16x16/libpeas-plugin.svg | 17 +---------------- data/icons/22x22/libpeas-plugin.svg | 17 +---------------- data/icons/32x32/libpeas-plugin.svg | 17 +---------------- data/icons/scalable/libpeas-plugin.svg | 17 +---------------- 4 files changed, 4 insertions(+), 64 deletions(-) diff --git a/data/icons/16x16/libpeas-plugin.svg b/data/icons/16x16/libpeas-plugin.svg index 674d7819..ba0b359d 100644 --- a/data/icons/16x16/libpeas-plugin.svg +++ b/data/icons/16x16/libpeas-plugin.svg @@ -35,7 +35,7 @@ </dc:creator> <dc:date>2005-02-01</dc:date> <cc:license - rdf:resource="http://creativecommons.org/licenses/GPL/2.0/"; /> + rdf:resource="https://spdx.org/licenses/LGPL-2.1.html"; /> <dc:identifier>http://jimmac.musichall.cz/</dc:identifier> <dc:subject> <rdf:Bag> @@ -45,21 +45,6 @@ </rdf:Bag> </dc:subject> </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/GPL/2.0/";> - <cc:permits - rdf:resource="http://web.resource.org/cc/Reproduction"; /> - <cc:permits - rdf:resource="http://web.resource.org/cc/Distribution"; /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Notice"; /> - <cc:permits - rdf:resource="http://web.resource.org/cc/DerivativeWorks"; /> - <cc:requires - rdf:resource="http://web.resource.org/cc/ShareAlike"; /> - <cc:requires - rdf:resource="http://web.resource.org/cc/SourceCode"; /> - </cc:License> </rdf:RDF> </metadata> <sodipodi:namedview diff --git a/data/icons/22x22/libpeas-plugin.svg b/data/icons/22x22/libpeas-plugin.svg index 25af771c..7c70edbb 100644 --- a/data/icons/22x22/libpeas-plugin.svg +++ b/data/icons/22x22/libpeas-plugin.svg @@ -35,7 +35,7 @@ </dc:creator> <dc:date>2005-02-01</dc:date> <cc:license - rdf:resource="http://creativecommons.org/licenses/GPL/2.0/"; /> + rdf:resource="https://spdx.org/licenses/LGPL-2.1.html"; /> <dc:identifier>http://jimmac.musichall.cz/</dc:identifier> <dc:subject> <rdf:Bag> @@ -45,21 +45,6 @@ </rdf:Bag> </dc:subject> </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/GPL/2.0/";> - <cc:permits - rdf:resource="http://web.resource.org/cc/Reproduction"; /> - <cc:permits - rdf:resource="http://web.resource.org/cc/Distribution"; /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Notice"; /> - <cc:permits - rdf:resource="http://web.resource.org/cc/DerivativeWorks"; /> - <cc:requires - rdf:resource="http://web.resource.org/cc/ShareAlike"; /> - <cc:requires - rdf:resource="http://web.resource.org/cc/SourceCode"; /> - </cc:License> </rdf:RDF> </metadata> <sodipodi:namedview diff --git a/data/icons/32x32/libpeas-plugin.svg b/data/icons/32x32/libpeas-plugin.svg index be497769..3aa59552 100644 --- a/data/icons/32x32/libpeas-plugin.svg +++ b/data/icons/32x32/libpeas-plugin.svg @@ -37,7 +37,7 @@ </dc:creator> <dc:date>2005-02-01</dc:date> <cc:license - rdf:resource="http://creativecommons.org/licenses/GPL/2.0/"; /> + rdf:resource="https://spdx.org/licenses/LGPL-2.1.html"; /> <dc:identifier>http://jimmac.musichall.cz/</dc:identifier> <dc:subject> <rdf:Bag> @@ -47,21 +47,6 @@ </rdf:Bag> </dc:subject> </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/GPL/2.0/";> - <cc:permits - rdf:resource="http://web.resource.org/cc/Reproduction"; /> - <cc:permits - rdf:resource="http://web.resource.org/cc/Distribution"; /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Notice"; /> - <cc:permits - rdf:resource="http://web.resource.org/cc/DerivativeWorks"; /> - <cc:requires - rdf:resource="http://web.resource.org/cc/ShareAlike"; /> - <cc:requires - rdf:resource="http://web.resource.org/cc/SourceCode"; /> - </cc:License> </rdf:RDF> </metadata> <sodipodi:namedview diff --git a/data/icons/scalable/libpeas-plugin.svg b/data/icons/scalable/libpeas-plugin.svg index 39adbca3..70b07ec9 100644 --- a/data/icons/scalable/libpeas-plugin.svg +++ b/data/icons/scalable/libpeas-plugin.svg @@ -37,7 +37,7 @@ </dc:creator> <dc:date></dc:date> <cc:license - rdf:resource="http://creativecommons.org/licenses/GPL/2.0/"; /> + rdf:resource="https://spdx.org/licenses/LGPL-2.1.html"; /> <dc:identifier></dc:identifier> <dc:subject> <rdf:Bag> @@ -47,21 +47,6 @@ </rdf:Bag> </dc:subject> </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/GPL/2.0/";> - <cc:permits - rdf:resource="http://web.resource.org/cc/Reproduction"; /> - <cc:permits - rdf:resource="http://web.resource.org/cc/Distribution"; /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Notice"; /> - <cc:permits - rdf:resource="http://web.resource.org/cc/DerivativeWorks"; /> - <cc:requires - rdf:resource="http://web.resource.org/cc/ShareAlike"; /> - <cc:requires - rdf:resource="http://web.resource.org/cc/SourceCode"; /> - </cc:License> </rdf:RDF> </metadata> <sodipodi:namedview -- GitLab ++++++ dfc763c16c0ce66a180ccb13205f1ca9666278a8.patch ++++++ >From dfc763c16c0ce66a180ccb13205f1ca9666278a8 Mon Sep 17 00:00:00 2001 From: Bastien Nocera <[email protected]> Date: Mon, 14 Jun 2021 10:24:30 +0200 Subject: [PATCH] icons: Correct icon licenses again "icons: Update icon licenses" mentioned that it would change the licenses of those icons to match the license of the library (LGPLv2.1+) but instead linked to the reference for the LGPL2.1-only license. Link to the SPDX page for LGPLv2.1+ instead. Fixes: a9d2ba590641d832dcf6b97184687b6eb424c00f --- data/icons/16x16/libpeas-plugin.svg | 2 +- data/icons/22x22/libpeas-plugin.svg | 2 +- data/icons/32x32/libpeas-plugin.svg | 2 +- data/icons/scalable/libpeas-plugin.svg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/icons/16x16/libpeas-plugin.svg b/data/icons/16x16/libpeas-plugin.svg index ba0b359d..1883e8d7 100644 --- a/data/icons/16x16/libpeas-plugin.svg +++ b/data/icons/16x16/libpeas-plugin.svg @@ -35,7 +35,7 @@ </dc:creator> <dc:date>2005-02-01</dc:date> <cc:license - rdf:resource="https://spdx.org/licenses/LGPL-2.1.html"; /> + rdf:resource="https://spdx.org/licenses/LGPL-2.1-or-later.html"; /> <dc:identifier>http://jimmac.musichall.cz/</dc:identifier> <dc:subject> <rdf:Bag> diff --git a/data/icons/22x22/libpeas-plugin.svg b/data/icons/22x22/libpeas-plugin.svg index 7c70edbb..797fce86 100644 --- a/data/icons/22x22/libpeas-plugin.svg +++ b/data/icons/22x22/libpeas-plugin.svg @@ -35,7 +35,7 @@ </dc:creator> <dc:date>2005-02-01</dc:date> <cc:license - rdf:resource="https://spdx.org/licenses/LGPL-2.1.html"; /> + rdf:resource="https://spdx.org/licenses/LGPL-2.1-or-later.html"; /> <dc:identifier>http://jimmac.musichall.cz/</dc:identifier> <dc:subject> <rdf:Bag> diff --git a/data/icons/32x32/libpeas-plugin.svg b/data/icons/32x32/libpeas-plugin.svg index 3aa59552..01bc873d 100644 --- a/data/icons/32x32/libpeas-plugin.svg +++ b/data/icons/32x32/libpeas-plugin.svg @@ -37,7 +37,7 @@ </dc:creator> <dc:date>2005-02-01</dc:date> <cc:license - rdf:resource="https://spdx.org/licenses/LGPL-2.1.html"; /> + rdf:resource="https://spdx.org/licenses/LGPL-2.1-or-later.html"; /> <dc:identifier>http://jimmac.musichall.cz/</dc:identifier> <dc:subject> <rdf:Bag> diff --git a/data/icons/scalable/libpeas-plugin.svg b/data/icons/scalable/libpeas-plugin.svg index 70b07ec9..63106f56 100644 --- a/data/icons/scalable/libpeas-plugin.svg +++ b/data/icons/scalable/libpeas-plugin.svg @@ -37,7 +37,7 @@ </dc:creator> <dc:date></dc:date> <cc:license - rdf:resource="https://spdx.org/licenses/LGPL-2.1.html"; /> + rdf:resource="https://spdx.org/licenses/LGPL-2.1-or-later.html"; /> <dc:identifier></dc:identifier> <dc:subject> <rdf:Bag> -- GitLab
