[yum/f21] fix license handling
Tom Callaway
spot at fedoraproject.org
Wed Aug 6 11:59:18 UTC 2014
commit c805381c03db7394a66c42ca718f62b4e72778d1
Author: Tom Callaway <spot at fedoraproject.org>
Date: Wed Aug 6 13:59:15 2014 +0200
fix license handling
yum.spec | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/yum.spec b/yum.spec
index 51be47c..1ebe536 100644
--- a/yum.spec
+++ b/yum.spec
@@ -64,7 +64,7 @@ BuildRequires: bash-completion
Summary: RPM package installer/updater/manager
Name: yum
Version: 3.4.3
-Release: 152%{?dist}
+Release: 153%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -424,7 +424,9 @@ exit 0
%files -f %{name}.lang
%defattr(-, root, root, -)
-%doc README AUTHORS COPYING TODO ChangeLog PLUGINS
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc README AUTHORS TODO ChangeLog PLUGINS
%if %{move_yum_conf_back}
%config(noreplace) %{_sysconfdir}/yum.conf
%dir %{_sysconfdir}/yum.repos.d
@@ -467,7 +469,8 @@ exit 0
%files cron
%defattr(-,root,root)
-%doc COPYING
+%{!?_licensedir:%global license %%doc}
+%license COPYING
%{_sysconfdir}/cron.daily/0yum-daily.cron
%{_sysconfdir}/cron.hourly/0yum-hourly.cron
%config(noreplace) %{_sysconfdir}/yum/yum-cron.conf
@@ -507,6 +510,9 @@ exit 0
%endif
%changelog
+* Wed Aug 6 2014 Tom Callaway <spot at fedoraproject.org> - 3.4.3-153
+- fix license handling
+
* Wed Jun 18 2014 James Antill <james at fedoraproject.org> - 3.4.3-152
- update to latest HEAD
- Workaround the TypeError in _filter_deps(). BZ 1108625
More information about the scm-commits
mailing list