From ce0fa77acbe79f7153db3f76f0f368b46d02a1f7 Mon Sep 17 00:00:00 2001 From: Björn Persson Date: Apr 02 2021 16:10:35 +0000 Subject: Updated the licenses. --- diff --git a/gnatcoll-bindings.spec b/gnatcoll-bindings.spec index b651247..4b4bb69 100644 --- a/gnatcoll-bindings.spec +++ b/gnatcoll-bindings.spec @@ -1,13 +1,13 @@ Name: gnatcoll-bindings Epoch: 2 Version: 21.0.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The GNAT Components Collection – bindings Summary(sv): GNAT Components Collection – bindningar -License: GPLv3+ -# The source files are GPLv3+ and GPLv2+. These combine into GPLv3+ on the -# binary code. +License: GPLv3+ and GPLv3+ with exceptions +# The subpackages have different licenses. This is the aggregation of those. + URL: https://github.com/AdaCore/gnatcoll-bindings Source: https://github.com/AdaCore/gnatcoll-bindings/archive/v%{version}/%{name}-%{version}.tar.gz @@ -42,6 +42,9 @@ bindningar till GMP, Iconv, %{?with_python:Python, }Readline och Syslog. \ %package -n gnatcoll-gmp Summary: The GNAT Components Collection – GMP binding Summary(sv): GNAT Components Collection – GMP-bindning +License: GPLv3+ +# The Ada files of gnatcoll-gmp are GPLv3+ with exceptions but the C files are +# GPLv2+. These combine into GPLv3+ on the binary code. %description -n gnatcoll-gmp This is the GMP component of the GNAT Components Collection. It is an interface @@ -56,6 +59,7 @@ beräkningar. %package -n gnatcoll-iconv Summary: The GNAT Components Collection – Iconv binding Summary(sv): GNAT Components Collection – Iconvbindning +License: GPLv3+ with exceptions %description -n gnatcoll-iconv This is the Iconv component of the GNAT Components Collection. It is an @@ -84,6 +88,10 @@ mot pythontolken. %package -n gnatcoll-readline Summary: The GNAT Components Collection – Readline binding Summary(sv): GNAT Components Collection – Readlinebindning +License: GPLv3+ +# gnatcoll-readline.ads grants the GCC Runtime Library Exception but +# gnatcoll-readline.adb does not, and Readline itself is GPLv3+ without +# exceptions anyway. %description -n gnatcoll-readline This is the Readline component of the GNAT Components Collection. It is an @@ -97,6 +105,7 @@ gränssnitt mot biblioteket Readline för interaktiv inmatning från användaren %package -n gnatcoll-syslog Summary: The GNAT Components Collection – Syslog binding Summary(sv): GNAT Components Collection – Syslogbindning +License: GPLv3+ with exceptions %description -n gnatcoll-syslog This is the Syslog component of the GNAT Components Collection. It is an @@ -210,7 +219,8 @@ mv %{buildroot}%{_datadir}/examples/gnatcoll %{buildroot}%{_docdir}/gnatcoll/exa # Install the license with a single pathname that is shared by the subpackages. mkdir --parents %{buildroot}%{_licensedir}/%{name} -cp --preserve=timestamps COPYING3 %{buildroot}%{_licensedir}/%{name}/ +cp --preserve=timestamps COPYING3 COPYING.RUNTIME \ + --target-directory=%{buildroot}%{_licensedir}/%{name} %check @@ -219,7 +229,8 @@ cp --preserve=timestamps COPYING3 %{buildroot}%{_licensedir}/%{name}/ %files -n gnatcoll-gmp %{_libdir}/libgnatcoll_gmp.so.* -%license %{_licensedir}/%{name} +%dir %{_licensedir}/%{name} +%license %{_licensedir}/%{name}/COPYING3 %files -n gnatcoll-iconv %{_libdir}/libgnatcoll_iconv.so.* @@ -233,7 +244,8 @@ cp --preserve=timestamps COPYING3 %{buildroot}%{_licensedir}/%{name}/ %files -n gnatcoll-readline %{_libdir}/libgnatcoll_readline.so.* -%license %{_licensedir}/%{name} +%dir %{_licensedir}/%{name} +%license %{_licensedir}/%{name}/COPYING3 %files -n gnatcoll-syslog %{_libdir}/libgnatcoll_syslog.so.* @@ -248,6 +260,9 @@ cp --preserve=timestamps COPYING3 %{buildroot}%{_licensedir}/%{name}/ %changelog +* Fri Apr 02 2021 Björn Persson - 2:21.0.0-6 +- Updated the licenses. + * Mon Feb 08 2021 Björn Persson - 2:21.0.0-5 - Adjusted the usage project files.