[libarchive] fix license handling

Tom Callaway spot at fedoraproject.org
Thu Jul 17 18:06:40 UTC 2014


commit 71ff6ca57c06b2de82e6fbbcfbc51ed6d8baeabb
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Thu Jul 17 14:07:00 2014 -0400

    fix license handling

 libarchive.spec |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/libarchive.spec b/libarchive.spec
index 379da38..ea85268 100644
--- a/libarchive.spec
+++ b/libarchive.spec
@@ -1,6 +1,6 @@
 Name:           libarchive
 Version:        3.1.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A library for handling streaming archive formats
 
 Group:          System Environment/Libraries
@@ -140,7 +140,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README NEWS
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc README NEWS
 %{_libdir}/libarchive.so.13*
 %{_mandir}/*/cpio.*
 %{_mandir}/*/mtree.*
@@ -157,18 +159,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n bsdtar
 %defattr(-,root,root,-)
-%doc COPYING README NEWS
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc README NEWS
 %{_bindir}/bsdtar
 %{_mandir}/*/bsdtar*
 
 %files -n bsdcpio
 %defattr(-,root,root,-)
-%doc COPYING README NEWS
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc README NEWS
 %{_bindir}/bsdcpio
 %{_mandir}/*/bsdcpio*
 
 
 %changelog
+* Thu Jul 17 2014 Tom Callaway <spot at fedoraproject.org> - 3.1.2-9
+- fix license handling
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list