From 7e3dc7be07f03a57bd7d81ec409d97f0225b057a2d6ad8730cb4544b341455f0 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 23 May 2018 21:16:20 +0000 Subject: [PATCH] Accepting request 611715 from home:kbabioch:branches:KDE:Frameworks5 - Use OpenPGP signature provided upstream - Added AppStream.keyring, which contains the key from the author - Use %license macro for license files OBS-URL: https://build.opensuse.org/request/show/611715 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/AppStream?expand=0&rev=39 --- AppStream-0.11.8.tar.xz.asc | 16 ++++++ AppStream.changes | 7 +++ AppStream.keyring | 101 ++++++++++++++++++++++++++++++++++++ AppStream.spec | 28 +++++----- 4 files changed, 140 insertions(+), 12 deletions(-) create mode 100644 AppStream-0.11.8.tar.xz.asc create mode 100644 AppStream.keyring diff --git a/AppStream-0.11.8.tar.xz.asc b/AppStream-0.11.8.tar.xz.asc new file mode 100644 index 0000000..ebf117b --- /dev/null +++ b/AppStream-0.11.8.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE0zo/DKFrCsxRpgc4SUyKX79N7OsFAlpmavcACgkQSUyKX79N +7Ou+7xAAmO/VQpcqezjmLC4NtrD4Mp+yokxAO8r+2QKCv0nj5qQbyQjIc5l5DGWG +eoW3UigdIS00IKMIxGKVf+88nYZCw7he9zAhLffT7MXvyFPM+jov4j7lswMD2LLn +7ikA0kEzM64EzUw1V6zEYQWqEcy2x6BhfLpIIe+r2bNVi8ZoNT3WO/veHEX1XKa1 +1fLrj+rH5hYuNn/oT/AtxLWeuLyfk5f/PJ33RpvGHMer9m5LztYxYxUvJrm/2+WL +mS5XEiwwV5mX6NtW3tlXESEkEIiMHyYB9SV/8Pe6Oc7pVpa03EKGgQurzfQk1o/S +0L740pc9qFn3IjPtI+qJPSITOPRpyhHYaHm+gHSqKmYioRG6y2NYZj5xMjm3YCEc +ab9slTxAIZ42DK0sdtgaiv+W4Q9vwQTX91hKJgm4hP4HrSYHKwXaG4rpO9WmbucP +dJZ40a/N4iIZUlZOtNG7B2iiVZUWpI8rOP69yb9zRGncCG+OvVTMMM3Vr0i1YzQk +vSg9xjznqCw5gvFb9D+vSIz1Nki782g1HHCmdLmXqbyExzPoccxVSKYFa9Rc32gJ +plJ1myCnET1j35UZT47IQ3fBFaeD8ZyMYqOFjcvqgt5cwRCWvK7yiChpVIwkoAVf +2RjkhD9ooEdjyaKP/I3miPgqG1iNV1atdX/uxgUYzOgXDSZCtS0= +=lwfD +-----END PGP SIGNATURE----- diff --git a/AppStream.changes b/AppStream.changes index 6568415..64911f5 100644 --- a/AppStream.changes +++ b/AppStream.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 23 15:25:48 UTC 2018 - kbabioch@suse.com + +- Use OpenPGP signature provided upstream +- Added AppStream.keyring, which contains the key from the author +- Use %license macro for license files + ------------------------------------------------------------------- Sun Feb 11 12:01:59 UTC 2018 - fabian@ritter-vogt.de diff --git a/AppStream.keyring b/AppStream.keyring new file mode 100644 index 0000000..7e82dee --- /dev/null +++ b/AppStream.keyring @@ -0,0 +1,101 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=QKau +-----END PGP PUBLIC KEY BLOCK----- diff --git a/AppStream.spec b/AppStream.spec index bd8fbc7..0dfd6bd 100644 --- a/AppStream.spec +++ b/AppStream.spec @@ -23,10 +23,12 @@ Name: AppStream Version: 0.11.8 Release: 0 Summary: Utilities to generate, maintain and access the AppStream Xapian database -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Development/Libraries/C and C++ Url: https://www.freedesktop.org/software/appstream/docs/ -Source: http://www.freedesktop.org/software/appstream/releases/%{name}-%{version}.tar.xz +Source0: http://www.freedesktop.org/software/appstream/releases/%{name}-%{version}.tar.xz +Source1: http://www.freedesktop.org/software/appstream/releases/%{name}-%{version}.tar.xz.asc +Source2: %{name}.keyring Patch0: 0001-Fix-regression-from-153.patch BuildRequires: gettext BuildRequires: intltool @@ -53,7 +55,7 @@ AppStream database over a nice GObject-based interface. %package -n libappstream%{libappstream_sover} Summary: The main library for AppStream -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Libraries %description -n libappstream%{libappstream_sover} @@ -61,7 +63,7 @@ The main library for AppStream. %package -n libAppStreamQt%{libAppStreamQt_sover} Summary: Qt5 bindings for AppStream -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Libraries %description -n libAppStreamQt%{libAppStreamQt_sover} @@ -69,7 +71,7 @@ The Qt5 bindings for AppStream. %package -n libAppStreamQt-devel Summary: Needed include files and libraries for development -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Development/Libraries/C and C++ Requires: libAppStreamQt%{libAppStreamQt_sover} = %{version} Requires: libappstream%{libappstream_sover} = %{version} @@ -81,7 +83,7 @@ compile and link applications using the Qt bindings for AppStream. %package devel Summary: Needed include files and libraries for development -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Libraries/C and C++ Requires: libappstream%{libappstream_sover} = %{version} @@ -92,7 +94,7 @@ compile and link applications using AppStream. %package doc Summary: Documentation for AppStream -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Documentation/HTML %description doc @@ -103,7 +105,7 @@ This package contains the documentation files for AppStream. %package -n typelib-1_0-AppStream-1.0 Summary: Simple software installation management software -- Introspection bindings -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries %description -n typelib-1_0-AppStream-1.0 @@ -153,7 +155,8 @@ appstreamcli refresh --force || true %files %defattr(-,root,root) -%doc LICENSE* NEWS +%doc NEWS +%license LICENSE* %{_bindir}/appstreamcli %config(noreplace) %{_sysconfdir}/appstream.conf %dir %{_datadir}/metainfo @@ -162,12 +165,13 @@ appstreamcli refresh --force || true %files -n libappstream%{libappstream_sover} %defattr(-,root,root) -%doc LICENSE* NEWS +%doc NEWS +%license LICENSE* %{_libdir}/libappstream.so.* %files -n libAppStreamQt%{libAppStreamQt_sover} %defattr(-,root,root) -%doc LICENSE* +%license LICENSE* %{_libdir}/libAppStreamQt.so.* %files -n libAppStreamQt-devel @@ -190,7 +194,7 @@ appstreamcli refresh --force || true %files -n typelib-1_0-AppStream-1.0 %defattr(-,root,root) -%doc LICENSE* +%license LICENSE* %{_libdir}/girepository-1.0/AppStream-1.0.typelib %files doc