From 1fce088de930358f898351f56000c37b85a96e0e Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 6 Aug 2014 14:26:14 +0200 Subject: [PATCH] fix license handling --- zlib.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) 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 - 1.2.8-6 +- fix license handling + * Sat Jun 07 2014 Fedora Release Engineering - 1.2.8-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild