[syslinux/f21] fix license handling

Tom Callaway spot at fedoraproject.org
Tue Aug 5 15:48:27 UTC 2014


commit 31000d37033151d1054cab6af22170cf88deb9c8
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Tue Aug 5 17:48:20 2014 +0200

    fix license handling

 syslinux.spec |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/syslinux.spec b/syslinux.spec
index 799cd6a..2ef6a91 100644
--- a/syslinux.spec
+++ b/syslinux.spec
@@ -2,7 +2,7 @@ Summary: Simple kernel loader which boots from a FAT filesystem
 Name: syslinux
 Version: 6.02
 %define tarball_version 6.02
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project
@@ -159,7 +159,9 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc NEWS README* COPYING 
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc NEWS README*
 %doc doc/* 
 %doc sample
 %{_mandir}/man1/gethostip*
@@ -181,6 +183,8 @@ rm -rf %{buildroot}
 
 %files perl
 %defattr(-,root,root)
+%{!?_licensedir:%global license %%doc}
+%license COPYING
 %{_mandir}/man1/lss16toppm*
 %{_mandir}/man1/ppmtolss16*
 %{_mandir}/man1/syslinux2ansi*
@@ -196,6 +200,8 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root)
+%{!?_licensedir:%global license %%doc}
+%license COPYING
 %dir %{_datadir}/syslinux/com32
 %{_datadir}/syslinux/com32
 
@@ -231,6 +237,8 @@ rm -rf %{buildroot}
 
 %ifarch %{x86_64}
 %files efi64
+%{!?_licensedir:%global license %%doc}
+%license COPYING
 %dir %{_datadir}/syslinux/efi64
 %{_datadir}/syslinux/efi64
 %endif
@@ -247,6 +255,9 @@ elif [ -f /boot/extlinux.conf ]; then \
 fi
 
 %changelog
+* Tue Aug  5 2014 Tom Callaway <spot at fedoraproject.org> - 6.02-6
+- fix license handling
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.02-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list