jpopelka pushed to osbs (f20). "fix %license handling"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu May 21 16:58:23 UTC 2015
From 243195e6add22db4b9eb25302263bed39585bef7 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka at redhat.com>
Date: Thu, 21 May 2015 18:33:29 +0200
Subject: fix %license handling
diff --git a/osbs.spec b/osbs.spec
index d3a770e..54a3043 100644
--- a/osbs.spec
+++ b/osbs.spec
@@ -5,7 +5,7 @@
Name: osbs
Version: 0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Python command line client for OpenShift Build Service
Group: Development/Tools
@@ -95,21 +95,13 @@ ln -s %{_bindir}/osbs2 %{buildroot}%{_bindir}/osbs
%files
%doc README.md
-%if 0%{?rhel} || 0%{?fedora} < 21
-%doc LICENSE
-%else
-%license LICENSE
-%endif
%{_bindir}/osbs
%files -n python-osbs
%doc README.md
-%if 0%{?rhel} || 0%{?fedora} < 21
-%doc LICENSE
-%else
+%{!?_licensedir:%global license %%doc}
%license LICENSE
-%endif
%{_bindir}/osbs2
%if 0%{?rhel}
%{python_sitelib}/osbs/
@@ -125,11 +117,8 @@ ln -s %{_bindir}/osbs2 %{buildroot}%{_bindir}/osbs
%if 0%{?with_python3}
%files -n python3-osbs
%doc README.md
-%if 0%{?rhel} || 0%{?fedora} < 21
-%doc LICENSE
-%else
+%{!?_licensedir:%global license %%doc}
%license LICENSE
-%endif
%{_bindir}/osbs3
%{python3_sitelib}/osbs/
%{python3_sitelib}/osbs-%{version}-py3.*.egg-info/
@@ -138,6 +127,9 @@ ln -s %{_bindir}/osbs2 %{buildroot}%{_bindir}/osbs
%endif # with_python3
%changelog
+* Thu May 21 2015 Jiri Popelka <jpopelka at redhat.com> - 0.6-2
+- fix %%license handling
+
* Thu May 21 2015 Tomas Tomecek <ttomecek at redhat.com> - 0.6-1
- new upstream release: 0.6
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/osbs.git/commit/?h=f20&id=243195e6add22db4b9eb25302263bed39585bef7
More information about the scm-commits
mailing list