jpopelka pushed to osbs (epel7). "Revert "0.6" (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu May 21 16:57:36 UTC 2015


From ecf8d3417a5bcfc03b072326bf3c9d5e67d4f8d4 Mon Sep 17 00:00:00 2001
From: Tomas Tomecek <ttomecek at redhat.com>
Date: Thu, 21 May 2015 17:41:44 +0200
Subject: Revert "0.6"

This reverts commit 6909ee3ffc7302e9e101e15b4ba5fa1bca03e21a.

diff --git a/.gitignore b/.gitignore
index 925ebf5..901b4b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,3 @@
 /osbs-17537357967c740c6204dce24f97a0cc15c63353.tar.gz
 /0.5.tar.gz
 /osbs-a3021e7500edeb9b38a8f22092e65b06b92edc7b.tar.gz
-/osbs-947bcdf9a53b871735084627fe1720a14240ec10.tar.gz
diff --git a/osbs.spec b/osbs.spec
index f438c8f..d290e2d 100644
--- a/osbs.spec
+++ b/osbs.spec
@@ -1,12 +1,10 @@
-%{!?_licensedir:%global license %%doc}
-
 %global with_python3 0
 
-%global commit 947bcdf9a53b871735084627fe1720a14240ec10
+%global commit a3021e7500edeb9b38a8f22092e65b06b92edc7b
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           osbs
-Version:        0.6
+Version:        0.5
 Release:        1%{?dist}
 
 Summary:        Python command line client for OpenShift Build Service
@@ -97,12 +95,21 @@ 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
 %license LICENSE
+%endif
 %{_bindir}/osbs2
 %if 0%{?rhel}
 %{python_sitelib}/osbs/
@@ -118,7 +125,11 @@ 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
 %license LICENSE
+%endif
 %{_bindir}/osbs3
 %{python3_sitelib}/osbs/
 %{python3_sitelib}/osbs-%{version}-py3.*.egg-info/
@@ -127,9 +138,6 @@ ln -s  %{_bindir}/osbs2 %{buildroot}%{_bindir}/osbs
 %endif # with_python3
 
 %changelog
-* Thu May 21 2015 Tomas Tomecek <ttomecek at redhat.com> - 0.6-1
-- new upstream release: 0.6
-
 * Tue May 19 2015 Tomas Tomecek <ttomecek at redhat.com> - 0.5-1
 - new upstream release: 0.5
 
diff --git a/sources b/sources
index 7f40276..fe76cd6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-329e54333efb7002f90f3d0618dfd6a3  osbs-947bcdf9a53b871735084627fe1720a14240ec10.tar.gz
+3bc4a3ddcb127540c1a0d8b983b39311  osbs-a3021e7500edeb9b38a8f22092e65b06b92edc7b.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/osbs.git/commit/?h=epel7&id=ecf8d3417a5bcfc03b072326bf3c9d5e67d4f8d4


More information about the scm-commits mailing list