mmilata pushed to osbs (el6). "Merge branch 'el6' (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Apr 15 09:24:56 UTC 2015


>From 0800e94774f08ecaa6f92e26188ce9898045982c Mon Sep 17 00:00:00 2001
From: Tomas Tomecek <ttomecek at redhat.com>
Date: Thu, 2 Apr 2015 15:34:07 +0200
Subject: initial commit


diff --git a/.gitignore b/.gitignore
index e69de29..33b1f23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/osbs-e073d7cc6cf7a07eafa00e2d44a654a040640390.tar.gz
+/osbs-758648c85e1eed2bbd233183dcc65e9950c06100.tar.gz
+/osbs-545f910f53b4c4bfa4a5ff3392a4f67b49eb8984.tar.gz
diff --git a/osbs.spec b/osbs.spec
new file mode 100644
index 0000000..5bf9a37
--- /dev/null
+++ b/osbs.spec
@@ -0,0 +1,128 @@
+%global with_python3 0
+
+%global commit 545f910f53b4c4bfa4a5ff3392a4f67b49eb8984
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
+Name:           osbs
+Version:        0.1
+Release:        4%{?dist}
+
+Summary:        Python module and 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
+
+BuildArch:      noarch
+
+BuildRequires:  python2-devel
+BuildRequires:  python-setuptools
+
+%if 0%{?with_python3}
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+%endif
+
+Requires:       python-pycurl
+#Requires:       python-requests
+
+%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...
+All of this can be done from command line and from python.
+
+%if 0%{?with_python3}
+%package -n python3-osbs
+Summary:        Python module and command line client for OpenShift Build Service
+Group:          Development/Tools
+License:        BSD
+Requires:       python3-pycurl
+#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.
+%endif # with_python3
+
+
+%prep
+%setup -qn osbs-%{commit}
+
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
+%endif # with_python3
+
+
+%build
+# build python package
+%{__python} setup.py build
+
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif # with_python3
+
+
+%install
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install --skip-build --root %{buildroot}
+popd
+pushd %{buildroot}%{_bindir}
+mv osbs osbs3
+popd
+%endif # with_python3
+
+%{__python} setup.py install --skip-build --root %{buildroot}
+
+
+%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
+%{python2_sitelib}/osbs/
+%{python2_sitelib}/osbs-%{version}-py2.*.egg-info/
+%endif
+%dir %{_datadir}/osbs
+%{_datadir}/osbs/*.json
+
+
+%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/
+%dir %{_datadir}/osbs
+%{_datadir}/osbs/*.json
+%endif # with_python3
+
+%changelog
+* Tue Mar 24 2015 Jiri Popelka <jpopelka at redhat.com> - 0.1-4
+- update to 758648c8
+
+* Thu Mar 19 2015 Jiri Popelka <jpopelka at redhat.com> - 0.1-3
+- no need to require also python-requests
+
+* Thu Mar 19 2015 Jiri Popelka <jpopelka at redhat.com> - 0.1-2
+- separate executable for python 3
+
+* Wed Mar 18 2015 Jiri Popelka <jpopelka at redhat.com> - 0.1-1
+- initial spec
diff --git a/sources b/sources
index e69de29..41186a4 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+15c00a464495647ccd09a9f852596817  osbs-545f910f53b4c4bfa4a5ff3392a4f67b49eb8984.tar.gz
-- 
cgit v0.10.2


>From 7822dc173d0b8712cde6df19dd7e158906f90d58 Mon Sep 17 00:00:00 2001
From: Martin Milata <mmilata at srck.net>
Date: Wed, 8 Apr 2015 15:02:51 +0200
Subject: update to c1216ba


diff --git a/.gitignore b/.gitignore
index 33b1f23..8c71f83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /osbs-e073d7cc6cf7a07eafa00e2d44a654a040640390.tar.gz
 /osbs-758648c85e1eed2bbd233183dcc65e9950c06100.tar.gz
 /osbs-545f910f53b4c4bfa4a5ff3392a4f67b49eb8984.tar.gz
+/osbs-c1216ba6e3622f1d90fd79ecc4495c83d6c7d01d.tar.gz
diff --git a/osbs.spec b/osbs.spec
index 5bf9a37..7038edd 100644
--- a/osbs.spec
+++ b/osbs.spec
@@ -1,11 +1,11 @@
 %global with_python3 0
 
-%global commit 545f910f53b4c4bfa4a5ff3392a4f67b49eb8984
+%global commit c1216ba6e3622f1d90fd79ecc4495c83d6c7d01d
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           osbs
-Version:        0.1
-Release:        4%{?dist}
+Version:        0.2
+Release:        2.%{shortcommit}%{?dist}
 
 Summary:        Python module and command line client for OpenShift Build Service
 Group:          Development/Tools
@@ -115,6 +115,9 @@ popd
 %endif # with_python3
 
 %changelog
+* Wed Apr 08 2015 Martin Milata <mmilata at redhat.com> - 0.2-2.c1216ba
+- update to c1216ba
+
 * Tue Mar 24 2015 Jiri Popelka <jpopelka at redhat.com> - 0.1-4
 - update to 758648c8
 
diff --git a/sources b/sources
index 41186a4..b47822e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-15c00a464495647ccd09a9f852596817  osbs-545f910f53b4c4bfa4a5ff3392a4f67b49eb8984.tar.gz
+5ee691627f9f62597b27ea8ad05fd763  osbs-c1216ba6e3622f1d90fd79ecc4495c83d6c7d01d.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/osbs.git/commit/?h=el6&id=70c782b277444822b5f62e69dad776f0317b0919


More information about the scm-commits mailing list