jpopelka pushed to dock (f22). "fix el7 build"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue May 19 16:53:35 UTC 2015
From d0e70c5203ee37f782c3566c3239c378ffeed209 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka at redhat.com>
Date: Tue, 19 May 2015 18:46:40 +0200
Subject: fix el7 build
diff --git a/dock.spec b/dock.spec
index 10102f9..4989d38 100644
--- a/dock.spec
+++ b/dock.spec
@@ -1,4 +1,6 @@
+%if (0%{?fedora} >= 23 || 0%{?rhel} >= 8)
%global with_python3 1
+%endif
%global owner DBuildService
%global project dock
@@ -8,7 +10,7 @@
Name: dock
Version: 1.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Improved builder for Docker images
Group: Development/Tools
@@ -148,12 +150,14 @@ cp -a %{sources} %{buildroot}/%{_datadir}/%{name}/dock.tar.gz
%files
%doc README.md
+%{!?_licensedir:%global license %%doc}
%license LICENSE
%{_bindir}/dock
%files -n python-dock
%doc README.md
+%{!?_licensedir:%global license %%doc}
%license LICENSE
%{_bindir}/dock2
%dir %{python2_sitelib}/dock
@@ -179,6 +183,7 @@ cp -a %{sources} %{buildroot}/%{_datadir}/%{name}/dock.tar.gz
%if 0%{?with_python3}
%files -n python3-dock
%doc README.md
+%{!?_licensedir:%global license %%doc}
%license LICENSE
%{_bindir}/dock3
%dir %{python3_sitelib}/dock
@@ -211,6 +216,9 @@ cp -a %{sources} %{buildroot}/%{_datadir}/%{name}/dock.tar.gz
%changelog
+* Tue May 19 2015 Jiri Popelka <jpopelka at redhat.com> - 1.2.1-3
+- fix el7 build
+
* Tue May 19 2015 Jiri Popelka <jpopelka at redhat.com> - 1.2.1-2
- rebuilt
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/dock.git/commit/?h=f22&id=d0e70c5203ee37f782c3566c3239c378ffeed209
More information about the scm-commits
mailing list