ttomecek pushed to osbs (master). "0.5"

Tue May 19 14:59:55 UTC 2015

From 5a4e2e0d264bf5ecbca27ec4242d99e204f15e99 Mon Sep 17 00:00:00 2001
From: Tomas Tomecek <ttomecek at redhat.com>
Date: Tue, 19 May 2015 16:59:34 +0200
Subject: 0.5

diff --git a/.gitignore b/.gitignore
index cbb0c7f..76136ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /osbs-c1216ba6e3622f1d90fd79ecc4495c83d6c7d01d.tar.gz
 /osbs-432e5a08ccf10ed6d87ea654fce8d7d46674dfdf.tar.gz
 /osbs-17537357967c740c6204dce24f97a0cc15c63353.tar.gz
+/0.5.tar.gz
diff --git a/osbs.spec b/osbs.spec
index 494dc90..d47c1a3 100644
--- a/osbs.spec
+++ b/osbs.spec
@@ -1,20 +1,19 @@
 %global with_python3 0
 
-%global commit 17537357967c740c6204dce24f97a0cc15c63353
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
 Name:           osbs
-Version:        0.4
+Version:        0.5
 Release:        1%{?dist}
 
-Summary:        Python module and command line client for OpenShift Build Service
+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/%{version}.tar.gz
 
 BuildArch:      noarch
 
+Requires:       python-osbs
+
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
 
@@ -23,26 +22,37 @@ BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 %endif
 
+%description
+It is able to query OpenShift v3 for various stuff related to building images.
+It can initiate builds, list builds, get info about builds, get build logs...
+This package contains osbs command line client.
+
+%package -n python-osbs
+Summary:        Python 2 module for OpenShift Build Service
+Group:          Development/Tools
+License:        BSD
 Requires:       python-pycurl
+Requires:       python-setuptools
 #Requires:       python-requests
 
-%description
+%description -n python-osbs
 It is able to query OpenShift v3 for various stuff related to building images.
 It can initiate builds, list builds, get info about builds, get build logs...
-All of this can be done from command line and from python.
+This package contains osbs Python 2 bindings.
 
 %if 0%{?with_python3}
 %package -n python3-osbs
-Summary:        Python module and command line client for OpenShift Build Service
+Summary:        Python 3 module for OpenShift Build Service
 Group:          Development/Tools
 License:        BSD
 Requires:       python3-pycurl
+Requires:       python3-setuptools
 #Requires:       python3-requests
 
 %description -n python3-osbs
 It is able to query OpenShift v3 for various stuff related to building images.
 It can initiate builds, list builds, get info about builds, get build logs...
-All of this can be done from command line and from python.
+This package contains osbs Python 3 bindings.
 %endif # with_python3
 
 
@@ -72,29 +82,26 @@ popd
 pushd %{py3dir}
 %{__python3} setup.py install --skip-build --root %{buildroot}
 popd
-pushd %{buildroot}%{_bindir}
-mv osbs osbs3
-popd
+mv %{buildroot}%{_bindir}/osbs %{buildroot}%{_bindir}/osbs3
 %endif # with_python3
 
 %{__python} setup.py install --skip-build --root %{buildroot}
+mv %{buildroot}%{_bindir}/osbs %{buildroot}%{_bindir}/osbs2
+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
-%if 0%{?rhel}
-%{python_sitelib}/osbs/
-%{python_sitelib}/osbs-%{version}-py2.*.egg-info/
-%else
+
+
+%files -n python-osbs
+%doc README.md
+%license LICENSE
+%{_bindir}/osbs2
 %{python2_sitelib}/osbs/
 %{python2_sitelib}/osbs-%{version}-py2.*.egg-info/
-%endif
 %dir %{_datadir}/osbs
 %{_datadir}/osbs/*.json
 
@@ -102,11 +109,7 @@ popd
 %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/
@@ -115,6 +118,14 @@ popd
 %endif # with_python3
 
 %changelog
+* Tue May 19 2015 Tomas Tomecek <ttomecek at redhat.com> - 0.5-1
+- new upstream release: 0.5
+
+* Tue May 12 2015 Slavek Kabrda <bkabrda at redhat.com> - 0.4-2
+- Introduce python-osbs subpackage
+- move /usr/bin/osbs to /usr/bin/osbs2, /usr/bin/osbs is now a symlink
+- depend on python[3]-setuptools because of entrypoints usage
+
 * Tue Apr 21 2015 Martin Milata <mmilata at redhat.com> - 0.4-1
 - new upstream release
 
@@ -124,6 +135,9 @@ popd
 * Wed Apr 08 2015 Martin Milata <mmilata at redhat.com> - 0.2-2.c1216ba
 - update to c1216ba
 
+* Tue Apr 07 2015 Tomas Tomecek <ttomecek at redhat.com> - 0.2-1
+- new upstream release
+
 * Tue Mar 24 2015 Jiri Popelka <jpopelka at redhat.com> - 0.1-4
 - update to 758648c8
 
diff --git a/sources b/sources
index 4e33f95..560ff2e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a4a42940df42965e47964de4b7da561  osbs-17537357967c740c6204dce24f97a0cc15c63353.tar.gz
+e3d1d171194b03d7c4dbffc40926fafd  0.5.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/osbs.git/commit/?h=master&id=5a4e2e0d264bf5ecbca27ec4242d99e204f15e99
