Compare commits

...

No commits in common. 'c9' and 'i8c' have entirely different histories.
c9 ... i8c

2
.gitignore vendored

@ -1 +1 @@
SOURCES/libpeas-1.30.0.tar.xz
SOURCES/libpeas-1.22.0.tar.xz

@ -1 +1 @@
6b40355a4b6a29b39e01159d5166e5762258cf8b SOURCES/libpeas-1.30.0.tar.xz
2e84a418208ff9a15f16566b552734c1b7af0edc SOURCES/libpeas-1.22.0.tar.xz

@ -1,74 +0,0 @@
From dfc763c16c0ce66a180ccb13205f1ca9666278a8 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
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 ba0b359..1883e8d 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 7c70edb..797fce8 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 3aa5955..01bc873 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 70b07ec..63106f5 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>
--
2.31.1

@ -1,160 +0,0 @@
From a9d2ba590641d832dcf6b97184687b6eb424c00f Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
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 674d781..ba0b359 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 25af771..7c70edb 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 be49776..3aa5955 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 39adbca..70b07ec 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
--
2.31.1

@ -1,18 +1,24 @@
%if 0%{?fedora} || 0%{?rhel} > 7
%global use_python3 1
%else
%global use_python3 0
%endif
%global apiver 1.0
Name: libpeas
Version: 1.30.0
Release: 4%{?dist}
Version: 1.22.0
Release: 6%{?dist}
Summary: Plug-ins implementation convenience library
License: LGPLv2+
URL: https://wiki.gnome.org/Projects/Libpeas
Source0: https://download.gnome.org/sources/%{name}/1.30/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/%{name}/1.22/%{name}-%{version}.tar.xz
BuildRequires: chrpath
BuildRequires: gcc
BuildRequires: gettext
BuildRequires: gtk-doc
BuildRequires: meson
BuildRequires: intltool
BuildRequires: make
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gladeui-2.0)
BuildRequires: pkgconfig(glib-2.0)
@ -21,12 +27,9 @@ BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(pygobject-3.0)
%if %{use_python3}
BuildRequires: python3-devel
# https://gitlab.gnome.org/GNOME/libpeas/-/merge_requests/31
Patch0: 0001-icons-Update-icon-licenses.patch
# https://gitlab.gnome.org/GNOME/libpeas/-/merge_requests/32
Patch1: 0001-icons-Correct-icon-licenses-again.patch
%endif
%description
libpeas is a convenience library making adding plug-ins support
@ -40,6 +43,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
libpeas-gtk is a convenience library making adding plug-ins support
to GTK+-based applications.
%if %{use_python3}
%package loader-python3
Summary: Python 3 loader for libpeas
Requires: %{name}%{?_isa} = %{version}-%{release}
@ -51,6 +55,7 @@ Provides: libpeas-loader-python = %{version}-%{release}
%description loader-python3
This package contains the Python 3 loader that is needed to
run Python 3 plugins that use libpeas.
%endif
%package devel
Summary: Development files for libpeas
@ -62,25 +67,34 @@ This package contains development libraries and header files
that are needed to write applications that use libpeas.
%prep
%autosetup -p1
%autosetup
%build
%meson \
-Ddemos=false \
-Dvapi=true \
-Dgtk_doc=true
%meson_build
%configure --disable-silent-rules
%make_build
%install
%meson_install
%make_install
find $RPM_BUILD_ROOT%{_libdir} -type f -name '*.la' -print -delete
%find_lang libpeas-1.0
# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/peas-demo
%if %{use_python3}
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libpeas-1.0/loaders/libpython3loader.so
%endif
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libpeas-gtk-1.0.so
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/peas-demo/plugins/helloworld/libhelloworld.so
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/peas-demo/plugins/secondtime/libsecondtime.so
%files -f libpeas-1.0.lang
%find_lang libpeas
%ldconfig_scriptlets
%files -f libpeas.lang
%doc AUTHORS NEWS README
%license COPYING
%{_libdir}/libpeas-%{apiver}.so.0*
%{_libdir}/libpeas-%{apiver}.so.*
%dir %{_libdir}/libpeas-%{apiver}/
%dir %{_libdir}/libpeas-%{apiver}/loaders
%dir %{_libdir}/girepository-1.0
@ -88,14 +102,18 @@ that are needed to write applications that use libpeas.
%{_datadir}/icons/hicolor/*/actions/libpeas-plugin.*
%files gtk
%{_libdir}/libpeas-gtk-%{apiver}.so.0*
%{_libdir}/libpeas-gtk-%{apiver}.so.*
%{_libdir}/girepository-1.0/PeasGtk-%{apiver}.typelib
%if %{use_python3}
%files loader-python3
%{_libdir}/libpeas-%{apiver}/loaders/libpython3loader.so
%endif
%files devel
%{_bindir}/peas-demo
%{_includedir}/libpeas-%{apiver}/
%{_libdir}/peas-demo/
%dir %{_datadir}/gtk-doc/
%dir %{_datadir}/gtk-doc/html/
%{_datadir}/gtk-doc/html/libpeas/
@ -109,97 +127,14 @@ that are needed to write applications that use libpeas.
%{_datadir}/glade/catalogs/libpeas-gtk.xml
%changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.30.0-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Jun 11 2021 Bastien Nocera <bnocera@redhat.com> - 1.30.0-3
+ libpeas-1.30.0-3
- Correct license for some of the icons
- Resolves: rhbz#1971434
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.30.0-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Mon Mar 22 2021 Kalev Lember <klember@redhat.com> - 1.30.0-1
- Update to 1.30.0
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.28.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sat Sep 12 2020 Kalev Lember <klember@redhat.com> - 1.28.0-1
- Update to 1.28.0
* Tue Aug 04 2020 Bastien Nocera <bnocera@redhat.com> - 1.26.0-5
+ libpeas-1.26.0-5
- Remove unused Python macro that caused errors on install (#1863667)
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.26.0-4
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.26.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.26.0-2
- Rebuilt for Python 3.9
* Fri Mar 06 2020 Kalev Lember <klember@redhat.com> - 1.26.0-1
- Update to 1.26.0
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.25.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jan 16 2020 Kalev Lember <klember@redhat.com> - 1.25.3-1
- Update to 1.25.3
* Thu Oct 31 2019 Kalev Lember <klember@redhat.com> - 1.24.1-1
- Update to 1.24.1
* Tue Sep 10 2019 Kalev Lember <klember@redhat.com> - 1.24.0-1
- Update to 1.24.0
* Thu Sep 05 2019 Kalev Lember <klember@redhat.com> - 1.23.92-1
- Update to 1.23.92
* Tue Aug 20 2019 Kalev Lember <klember@redhat.com> - 1.23.90.1-2
- Revert inadvertent soname bump
- Tighten spec file globs to avoid accidental soname bumps in the future
* Tue Aug 20 2019 Kalev Lember <klember@redhat.com> - 1.23.90.1-1
- Update to 1.23.90.1
- Switch to the meson build system
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.22.0-14
- Rebuilt for Python 3.8
* Thu Aug 01 2019 Bastien Nocera <bnocera@redhat.com> - 1.22.0-13
+ libpeas-1.22.0-13
- Force disable the Python2 loader, which could still be built by accident (#1736043)
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 31 2019 Charalampos Stratakis <cstratak@redhat.com> - 1.22.0-11
- Fix FTBFS with Python 3.8 (#1715665)
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.22.0-8
- Rebuilt for Python 3.7
* Wed Jun 06 2018 Bastien Nocera <bnocera@redhat.com> - 1.22.0-7
+ libpeas-1.22.0-7
- Obsolete libpeas-loader-python
* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 1.22.0-6
- Rebuilt for MSVSphere 8.8
* Thu Mar 22 2018 Bastien Nocera <bnocera@redhat.com> - 1.22.0-6
* Wed Jun 06 2018 Bastien Nocera <bnocera@redhat.com> - 1.22.0-6
+ libpeas-1.22.0-6
- Remove python2 loader, all GNOME apps using libpeas were ported to Python3
when ported to GTK+ 3.x
when ported to GTK+ 3.x, and obsolete libpeas-loader-python
- Resolves: #1559090
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Loading…
Cancel
Save