[sudo/f20] fix license handling
Daniel Kopeček
mildew at fedoraproject.org
Tue Sep 30 14:59:42 UTC 2014
commit f33c1d92e604a046ac7aec9f23275bd362880cf0
Author: Tom Callaway <spot at fedoraproject.org>
Date: Tue Aug 5 11:05:06 2014 -0400
fix license handling
Conflicts:
sudo.spec
sudo.spec | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/sudo.spec b/sudo.spec
index c2b73ad..6615bac 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -1,7 +1,7 @@
Summary: Allows restricted root access for specified users
Name: sudo
Version: 1.8.8
-Release: 4%{?dist}
+Release: 5%{?dist}
License: ISC
Group: Applications/System
URL: http://www.courtesan.com/sudo/
@@ -112,6 +112,9 @@ chmod +x $RPM_BUILD_ROOT%{_libexecdir}/sudo/*.so # for stripping, reset in %%fil
# Remove execute permission on this script so we don't pull in perl deps
chmod -x $RPM_BUILD_ROOT%{_pkgdocdir}/sudoers2ldif
+# Don't package LICENSE as a doc
+rm -rf $RPM_BUILD_ROOT%{_pkgdocdir}/LICENSE
+
%find_lang sudo
%find_lang sudoers
@@ -167,6 +170,8 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/visudo.8*
%dir %{_pkgdocdir}/
%{_pkgdocdir}/*
+%{!?_licensedir:%global license %%doc}
+%license doc/LICENSE
%exclude %{_pkgdocdir}/ChangeLog
@@ -181,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/sudo_plugin.8*
%changelog
+* Tue Aug 5 2014 Tom Callaway <spot at fedoraproject.org> - 1.8.8-5
+- fix license handling
+
* Sat May 31 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1.8.8-4
- Drop ChangeLog, we ship NEWS
More information about the scm-commits
mailing list