Re: [Freeipa-devel] [PATCH] 1115 Use %license tag in spec file

2015-08-31 Thread Martin Basti



On 08/17/2015 04:20 PM, Rob Crittenden wrote:

Use %license instead of %doc in spec file to ship the license.

rob



ACK

Pushed to:
master: 7ed51586ca8ccaafab6bb11bb5161dc25800fddf
ipa-4-2: 30cfae7823d1a77438bab94726139f9764456a88

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

[Freeipa-devel] [PATCH] 1115 Use %license tag in spec file

2015-08-17 Thread Rob Crittenden

Use %license instead of %doc in spec file to ship the license.

rob
>From 8a7c8c1204ec6fe4e18b3fdf2797b833faa90c09 Mon Sep 17 00:00:00 2001
From: Rob Crittenden 
Date: Mon, 17 Aug 2015 10:14:05 -0400
Subject: [PATCH] Use %license instead of %doc for packaging the license

https://fedorahosted.org/freeipa/ticket/5227
---
 freeipa.spec.in | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/freeipa.spec.in b/freeipa.spec.in
index 57d3d26e94aab6267143793943268175ed440586..3afd6f153a11da27a399b3b5cfa874ea9780d614 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -692,7 +692,8 @@ fi
 %if ! %{ONLY_CLIENT}
 %files server -f server-python.list
 %defattr(-,root,root,-)
-%doc COPYING README Contributors.txt
+%doc README Contributors.txt
+%license COPYING
 %{_sbindir}/ipa-backup
 %{_sbindir}/ipa-restore
 %{_sbindir}/ipa-ca-install
@@ -904,7 +905,8 @@ fi
 
 %files client
 %defattr(-,root,root,-)
-%doc COPYING README Contributors.txt
+%doc README Contributors.txt
+%license COPYING
 %{_sbindir}/ipa-client-install
 %{_sbindir}/ipa-client-automount
 %{_sbindir}/ipa-certupdate
@@ -926,14 +928,16 @@ fi
 
 %files admintools
 %defattr(-,root,root,-)
-%doc COPYING README Contributors.txt
+%doc README Contributors.txt
+%license COPYING
 %{_bindir}/ipa
 %config %{_sysconfdir}/bash_completion.d
 %{_mandir}/man1/ipa.1.gz
 
 %files python -f %{gettext_domain}.lang
 %defattr(-,root,root,-)
-%doc COPYING README Contributors.txt
+%doc README Contributors.txt
+%license COPYING
 %dir %{python_sitelib}/ipapython
 %{python_sitelib}/ipapython/*.py*
 %dir %{python_sitelib}/ipapython/dnssec
@@ -965,7 +969,8 @@ fi
 %if ! %{ONLY_CLIENT}
 %files tests -f tests-python.list
 %defattr(-,root,root,-)
-%doc COPYING README Contributors.txt
+%doc README Contributors.txt
+%license COPYING
 %dir %{python_sitelib}/ipatests
 %dir %{python_sitelib}/ipatests/test_cmdline
 %dir %{python_sitelib}/ipatests/test_install
-- 
1.9.3

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code