rpms/zlib
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix license handling

Browse Source
This commit is contained in:
Tom Callaway 2014-08-06 14:26:41 +02:00
parent 7c6a2abd33
commit fbb668e941
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zlib.spec
View File

@ -1,7 +1,7 @@
Summary: The compression and decompression library Summary: The compression and decompression library
Name: zlib Name: zlib
Version: 1.2.8 Version: 1.2.8
Release: 5%{?dist} Release: 6%{?dist}
# /contrib/dotzlib/ have Boost license # /contrib/dotzlib/ have Boost license
License: zlib and Boost License: zlib and Boost
Group: System Environment/Libraries Group: System Environment/Libraries
@ -112,11 +112,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%postun -n minizip -p /sbin/ldconfig %postun -n minizip -p /sbin/ldconfig
%files %files
%doc README ChangeLog FAQ %{!?_licensedir:%global license %%doc}
%license README
%doc ChangeLog FAQ
%{_libdir}/libz.so.* %{_libdir}/libz.so.*
%files devel %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}/libz.so
%{_libdir}/pkgconfig/zlib.pc %{_libdir}/pkgconfig/zlib.pc
%{_includedir}/zlib.h %{_includedir}/zlib.h
@ -124,7 +128,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_mandir}/man3/zlib.3* %{_mandir}/man3/zlib.3*
%files static %files static
%doc README %{!?_licensedir:%global license %%doc}
%license README
%{_libdir}/libz.a %{_libdir}/libz.a
%files -n minizip %files -n minizip
@ -138,6 +143,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_libdir}/pkgconfig/minizip.pc %{_libdir}/pkgconfig/minizip.pc
%changelog %changelog
* Wed Aug 6 2014 Tom Callaway <spot@fedoraproject.org> - 1.2.8-6
- fix license handling
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.8-5 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild