jpopelka pushed to osbs (f21). "Merge branch 'epel7'"

[notifications at fedoraproject.org]

From dd6699e024041ec8c704fae590bebd8c0bb002c2 Mon Sep 17 00:00:00 2001
From: Tomas Tomecek <ttomecek at redhat.com>
Date: Tue, 19 May 2015 17:04:26 +0200
Subject: fedora guidelines, github source


diff --git a/.gitignore b/.gitignore
index 76136ed..901b4b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /osbs-432e5a08ccf10ed6d87ea654fce8d7d46674dfdf.tar.gz
 /osbs-17537357967c740c6204dce24f97a0cc15c63353.tar.gz
 /0.5.tar.gz
+/osbs-a3021e7500edeb9b38a8f22092e65b06b92edc7b.tar.gz
diff --git a/osbs.spec b/osbs.spec
index d47c1a3..42debb3 100644
--- a/osbs.spec
+++ b/osbs.spec
@@ -1,5 +1,8 @@
 %global with_python3 0
 
+%global commit a3021e7500edeb9b38a8f22092e65b06b92edc7b
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
 Name:           osbs
 Version:        0.5
 Release:        1%{?dist}
@@ -8,7 +11,7 @@ Summary:        Python command line client for OpenShift Build Service
 Group:          Development/Tools
 License:        BSD
 URL:            https://github.com/DBuildService/osbs
-Source0:        https://github.com/DBuildService/osbs/archive/%{version}.tar.gz
+Source0:        https://github.com/DBuildService/osbs/archive/%{commit}/osbs-%{commit}.tar.gz  
 
 BuildArch:      noarch
 
diff --git a/sources b/sources
index 560ff2e..fe76cd6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e3d1d171194b03d7c4dbffc40926fafd  0.5.tar.gz
+3bc4a3ddcb127540c1a0d8b983b39311  osbs-a3021e7500edeb9b38a8f22092e65b06b92edc7b.tar.gz
-- 
cgit v0.10.2


From a6f32f0510c7682b507ea0d50c7df667b5149a16 Mon Sep 17 00:00:00 2001
From: Tomas Tomecek <ttomecek at redhat.com>
Date: Tue, 19 May 2015 17:43:46 +0200
Subject: one spec to rule them all


diff --git a/osbs.spec b/osbs.spec
index 42debb3..d290e2d 100644
--- a/osbs.spec
+++ b/osbs.spec
@@ -11,7 +11,7 @@ Summary:        Python command line client for OpenShift Build Service
 Group:          Development/Tools
 License:        BSD
 URL:            https://github.com/DBuildService/osbs
-Source0:        https://github.com/DBuildService/osbs/archive/%{commit}/osbs-%{commit}.tar.gz  
+Source0:        https://github.com/DBuildService/osbs/archive/%{commit}/osbs-%{commit}.tar.gz
 
 BuildArch:      noarch
 
@@ -95,16 +95,29 @@ 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/
+%{python_sitelib}/osbs-%{version}-py2.*.egg-info/
+%else
 %{python2_sitelib}/osbs/
 %{python2_sitelib}/osbs-%{version}-py2.*.egg-info/
+%endif
 %dir %{_datadir}/osbs
 %{_datadir}/osbs/*.json
 
@@ -112,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/
-- 
cgit v0.10.2


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