From ceee91719be5663d1b638a915c3d455f5a579994 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Mon, 12 Nov 2012 18:50:44 +0100
Subject: [PATCH] Fix up licenses for qt and qt4 subpackages

---
 pinentry.spec | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pinentry.spec b/pinentry.spec
index 0b37304..a08df8e 100644
--- a/pinentry.spec
+++ b/pinentry.spec
@@ -17,10 +17,11 @@
 
 Name:    pinentry
 Version: 0.8.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Collection of simple PIN or passphrase entry dialogs
 
 Group:   Applications/System
+# qt & qt4 subpackage have different license, see subpackage definitions
 License: GPLv2+
 URL:     http://www.gnupg.org/aegypten/
 Source0: ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz
@@ -69,6 +70,8 @@ This package contains the GTK GUI based version of the PIN entry dialog.
 %package qt
 Summary: Passphrase/PIN entry dialog based on Qt%{?qt_major}
 Group:   Applications/System
+# Original license for secq* files doesn't allow higher GPL versions to be used
+License: GPLv2
 Requires: %{name} = %{version}-%{release}
 Provides: %{name}-gui = %{version}-%{release}
 %if ! 0%{?_enable_pinentry_qt}
@@ -84,6 +87,9 @@ This package contains the Qt%{?qt_major} GUI based version of the PIN entry dial
 %package qt4
 Summary: Passphrase/PIN entry dialog based on Qt4
 Group:   Applications/System
+# original code for secstring.cpp doesn't allow GPL versions higher than 3 to be
+# used
+License: GPLv2 or GPLv3
 Requires: %{name} = %{version}-%{release}
 Provides: %{name}-gui = %{version}-%{release}
 %description qt4
@@ -189,6 +195,9 @@ fi
 
 
 %changelog
+* Mon Nov 12 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.8.1-8
+- Fix up licenses for qt and qt4 subpackages
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild