[pcre/f21] fix license handling

Tom Callaway spot at fedoraproject.org
Wed Jul 30 15:40:50 UTC 2014


commit 6461bd253c30bf52c2004b5fb8a4d12412dd9dd2
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Wed Jul 30 11:40:45 2014 -0400

    fix license handling

 pcre.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/pcre.spec b/pcre.spec
index 8ad64c8..85c6fb8 100644
--- a/pcre.spec
+++ b/pcre.spec
@@ -2,7 +2,7 @@
 #%%global rcversion RC1
 Name: pcre
 Version: 8.35
-Release: %{?rcversion:0.}4%{?rcversion:.%rcversion}%{?dist}
+Release: %{?rcversion:0.}5%{?rcversion:.%rcversion}%{?dist}
 %global myversion %{version}%{?rcversion:-%rcversion}
 Summary: Perl-compatible regular expression library
 Group: System Environment/Libraries
@@ -127,7 +127,9 @@ make %{?_smp_mflags} check
 
 %files
 %{_libdir}/*.so.*
-%doc AUTHORS COPYING LICENCE NEWS README ChangeLog
+%{!?_licensedir:%global license %%doc}
+%license COPYING LICENCE
+%doc AUTHORS NEWS README ChangeLog
 
 %files devel
 %{_libdir}/*.so
@@ -141,7 +143,8 @@ make %{?_smp_mflags} check
 
 %files static
 %{_libdir}/*.a
-%doc COPYING LICENCE 
+%{!?_licensedir:%global license %%doc}
+%license COPYING LICENCE
 
 %files tools
 %{_bindir}/pcregrep
@@ -150,6 +153,9 @@ make %{?_smp_mflags} check
 %{_mandir}/man1/pcretest.*
 
 %changelog
+* Wed Jul 30 2014 Tom Callaway <spot at fedoraproject.org> - 8.35-5
+- fix license handling
+
 * Mon Jul 14 2014 Petr Pisar <ppisar at redhat.com> - 8.35-4
 - Fix empty-matching possessive zero-repeat groups in interpreted mode
   (bug #1119241)


More information about the scm-commits mailing list