+ libpeas-1.30.0-3 Correct license for some of the icons
Resolves: rhbz#1971434
This commit is contained in:
parent
bd349f3ad7
commit
914df73c42
74
0001-icons-Correct-icon-licenses-again.patch
Normal file
74
0001-icons-Correct-icon-licenses-again.patch
Normal file
@ -0,0 +1,74 @@
|
||||
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
|
||||
|
||||
160
0001-icons-Update-icon-licenses.patch
Normal file
160
0001-icons-Update-icon-licenses.patch
Normal file
@ -0,0 +1,160 @@
|
||||
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
|
||||
|
||||
12
libpeas.spec
12
libpeas.spec
@ -2,7 +2,7 @@
|
||||
|
||||
Name: libpeas
|
||||
Version: 1.30.0
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Plug-ins implementation convenience library
|
||||
|
||||
License: LGPLv2+
|
||||
@ -23,6 +23,11 @@ BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(pygobject-3.0)
|
||||
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
|
||||
|
||||
%description
|
||||
libpeas is a convenience library making adding plug-ins support
|
||||
to glib-based applications.
|
||||
@ -104,6 +109,11 @@ that are needed to write applications that use libpeas.
|
||||
%{_datadir}/glade/catalogs/libpeas-gtk.xml
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user