From 2afbeb69738766cd14b4a9e12e5685b3912e3806 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Sep 23 2011 18:45:37 +0000
Subject: License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) (#226419)


---

diff --git a/sip.spec b/sip.spec
index f09a88c..c3a9bb1 100644
--- a/sip.spec
+++ b/sip.spec
@@ -10,8 +10,9 @@
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
 Version: 4.12.4
-Release: 2%{?dist}
-License: GPLv2 or GPLv3
+Release: 3%{?dist}
+# sipgen/parser.{c.h} is GPLv3+ with exceptions (bison)
+License: GPLv2 or GPLv3 and (GPLv3+ with exceptions)
 Group: Development/Tools
 Url: http://www.riverbankcomputing.com/software/sip/intro 
 Source0: http://www.riverbankcomputing.com/static/Downloads/sip4/sip-%{version}%{?snap:-snapshot-%{snap}}.tar.gz
@@ -185,6 +186,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 23 2011 Rex Dieter <rdieter@fedoraproject.org> 4.12.4-3
+- License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) (#226419)
+
 * Wed Sep 14 2011 Rex Dieter <rdieter@fedoraproject.org> 4.12.4-2
 - try not to rpath the world (#737236)