From c6a7a1b5b1e7bfdae18a99372d2986a2f2b4329e Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 9 Dec 2010 15:51:17 +0200 Subject: [PATCH] Added 'and GPLv2+' to license tag and updated the list of license files https://bugzilla.redhat.com/show_bug.cgi?id=660600 --- pcsc-lite-ccid.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pcsc-lite-ccid.spec b/pcsc-lite-ccid.spec index 47c71cf..41e269b 100644 --- a/pcsc-lite-ccid.spec +++ b/pcsc-lite-ccid.spec @@ -4,11 +4,13 @@ Name: pcsc-lite-ccid Version: 1.4.0 -Release: 3%{dist} +Release: 4%{dist} Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries -License: LGPLv2+ +# The library itself is LGPLv2+, but the files in contrib/RSA_SecurID/ which +# get compiled in a separate binary are GPLv2+. +License: LGPLv2+ and GPLv2+ URL: http://pcsclite.alioth.debian.org/ccid.html Source0: http://alioth.debian.org/download.php/%{upstream_build}/ccid-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -41,6 +43,7 @@ make %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT/usr/share/doc/ccid/README_Kobil_mIDentity_switch.txt ./ +cp -p src/openct/LICENSE LICENSE.openct install -Dpm 644 src/pcscd_ccid.rules $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/85-pcscd_ccid.rules @@ -59,7 +62,7 @@ exit 0 %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README README_Kobil_mIDentity_switch.txt +%doc AUTHORS ChangeLog COPYING LICENSE.openct README README_Kobil_mIDentity_switch.txt %{dropdir}/ifd-ccid.bundle/ %{dropdir}/serial/ %config(noreplace) %{_sysconfdir}/reader.conf.d/libccidtwin @@ -71,6 +74,10 @@ exit 0 %changelog +* Thu Dec 09 2010 Kalev Lember - 1.4.0-4 +- Install src/openct/LICENSE file as LICENSE.openct in docs (#660600) +- Added 'and GPLv2+' to license tag to cover RSA_SecurID (#660600) + * Tue Dec 07 2010 Kalev Lember - 1.4.0-3 - Renamed ccid package to pcsc-lite-ccid (#654377) - Mark files under reader.conf.d as config(noreplace)