jcapik pushed to zlib (f22). "fix license handling"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Jun 10 16:03:35 UTC 2015
From fbb668e9410f736bbe997ac85a16113e65d40f52 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Wed, 6 Aug 2014 14:26:41 +0200
Subject: fix license handling
diff --git a/zlib.spec b/zlib.spec
index 1f31d9d..2ed881e 100644
--- a/zlib.spec
+++ b/zlib.spec
@@ -1,7 +1,7 @@
Summary: The compression and decompression library
Name: zlib
Version: 1.2.8
-Release: 5%{?dist}
+Release: 6%{?dist}
# /contrib/dotzlib/ have Boost license
License: zlib and Boost
Group: System Environment/Libraries
@@ -112,11 +112,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%postun -n minizip -p /sbin/ldconfig
%files
-%doc README ChangeLog FAQ
+%{!?_licensedir:%global license %%doc}
+%license README
+%doc ChangeLog FAQ
%{_libdir}/libz.so.*
%files devel
-%doc README doc/algorithm.txt test/example.c
+%{!?_licensedir:%global license %%doc}
+%license README
+%doc doc/algorithm.txt test/example.c
%{_libdir}/libz.so
%{_libdir}/pkgconfig/zlib.pc
%{_includedir}/zlib.h
@@ -124,7 +128,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_mandir}/man3/zlib.3*
%files static
-%doc README
+%{!?_licensedir:%global license %%doc}
+%license README
%{_libdir}/libz.a
%files -n minizip
@@ -138,6 +143,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_libdir}/pkgconfig/minizip.pc
%changelog
+* Wed Aug 6 2014 Tom Callaway <spot at fedoraproject.org> - 1.2.8-6
+- fix license handling
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/zlib.git/commit/?h=f22&id=fbb668e9410f736bbe997ac85a16113e65d40f52
More information about the scm-commits
mailing list