The package rpms/conu.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/conu.git/commit/?id=d3ba8ec6eeb2e....
Change:
+ExcludeArch: ppc64
Thanks.
Full change:
============
commit 1ccb2dc1d9643062eb542e87ea48d9976f4e03f0
Merge: 57d9b83 3cb0985
Author: Tomas Tomecek <ttomecek(a)redhat.com>
Date: Wed May 2 16:33:32 2018 +0200
Merge branch 'master' into f28
diff --cc sources
index f1857ca,d0cf297..5e23517
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,2 @@@
+SHA512 (conu-0.2.0.tar.gz) =
2a1f1e544e817372899fb27774919e51e61820e869d828d04228f253e9491fdb3e2ca68b34a4453a824be9e3e30a4a171f1eb729468ec5c536f1853df0a5260b
+ SHA512 (conu-0.3.1.tar.gz) =
c9a82815e9050546ad83e793252e9e5961a1b9465e8304e1cbe2ffdf136e8696ad7d423268ba778e6c362534032ad1b78a711af49d71f009f83ed77cd5879cab
commit 3cb0985746038df5bef1a486a08974310f61baba
Author: Tomas Tomecek <ttomecek(a)redhat.com>
Date: Wed May 2 16:30:48 2018 +0200
0.3.1
Signed-off-by: Tomas Tomecek <ttomecek(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index c9d1ea5..1749bb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/conu-0.2.0.tar.gz
+/conu-0.3.1.tar.gz
diff --git a/conu.spec b/conu.spec
index 1397844..a8fc539 100644
--- a/conu.spec
+++ b/conu.spec
@@ -7,8 +7,8 @@
%endif
Name: %{pypi_name}
-Version: 0.2.0
-Release: 2%{?dist}
+Version: 0.3.1
+Release: 1%{?dist}
Summary: library which makes it easy to write tests for your containers
License: GPLv3+
@@ -152,6 +152,9 @@ rm -rf html/.{doctrees,buildinfo}
%license LICENSE
%changelog
+* Wed May 02 2018 Tomas Tomecek <ttomecek(a)redhat.com> - 0.3.1-1
+- New upstream release 0.3.1
+
* Thu Feb 01 2018 Tomas Tomecek <ttomecek(a)redhat.com> 0.2.0-1
- 0.2.0 release
diff --git a/sources b/sources
index f1857ca..d0cf297 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (conu-0.2.0.tar.gz) =
2a1f1e544e817372899fb27774919e51e61820e869d828d04228f253e9491fdb3e2ca68b34a4453a824be9e3e30a4a171f1eb729468ec5c536f1853df0a5260b
+SHA512 (conu-0.3.1.tar.gz) =
c9a82815e9050546ad83e793252e9e5961a1b9465e8304e1cbe2ffdf136e8696ad7d423268ba778e6c362534032ad1b78a711af49d71f009f83ed77cd5879cab
commit d3ba8ec6eeb2e12ef31e41cd4a62c05f9cf75c56
Author: Jan Koscielniak <jkosciel(a)redhat.com>
Date: Tue Feb 20 16:13:19 2018 +0100
Exclude ppc64 because of docker packages
diff --git a/conu.spec b/conu.spec
index 18a5934..1397844 100644
--- a/conu.spec
+++ b/conu.spec
@@ -8,14 +8,16 @@
Name: %{pypi_name}
Version: 0.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: library which makes it easy to write tests for your containers
License: GPLv3+
URL:
https://github.com/fedora-modularity/conu
Source0:
https://files.pythonhosted.org/packages/source/c/%{pypi_name}/%{pypi_name...
BuildArch: noarch
-
+# exclude ppc64 because there is no docker package
+#
https://bugzilla.redhat.com/show_bug.cgi?id=1547049
+ExcludeArch: ppc64
# for docs
commit 35d22333511bad215066d4b5712d2847b170a864
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Tue Feb 13 15:49:46 2018 +0100
fix conditionals
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/conu.spec b/conu.spec
index 7a216cc..18a5934 100644
--- a/conu.spec
+++ b/conu.spec
@@ -1,9 +1,9 @@
%global pypi_name conu
-%if 0%{?fedora}
-%bcond_without python3
-%else
+%if 0%{?rhel} && 0%{?rhel} <= 7
%bcond_with python3
+%else
+%bcond_without python3
%endif
Name: %{pypi_name}
@@ -16,22 +16,10 @@ URL:
https://github.com/fedora-modularity/conu
Source0:
https://files.pythonhosted.org/packages/source/c/%{pypi_name}/%{pypi_name...
BuildArch: noarch
-BuildRequires: python2-devel
-BuildRequires: python2-setuptools
# for docs
-%if 0%{?fedora}
-BuildRequires: python2-docker
-%else
-BuildRequires: python-docker-py
-%endif
-BuildRequires: python%{?fedora:2}-sphinx
-BuildRequires: pyxattr
-BuildRequires: python%{?fedora:2}-enum34
%if %{with python3}
-BuildRequires: python3-devel
-BuildRequires: python3-setuptools
%endif
%description
@@ -40,55 +28,64 @@ and is handy when playing with containers inside your code.
It defines an API to access and manipulate containers,
images and provides more, very helpful functions.
-
%package -n python2-%{pypi_name}
Summary: %{summary}
-%if 0%{?fedora}
%{?python_provide:%python_provide python2-%{pypi_name}}
-%endif
-
-%if 0%{?fedora}
-Requires: python2-docker
+BuildRequires: python2-devel
+BuildRequires: python2-setuptools
+%if 0%{?rhel} && 0%{?rhel} <= 7
+BuildRequires: python-docker-py
+BuildRequires: python-enum34
+Requires: python-docker-py
+Requires: python-enum34
+Requires: python-requests
%else
-Requires: python-docker-py
+BuildRequires: python2-docker
+BuildRequires: python2-enum34
+Requires: python2-docker
+Requires: python2-enum34
+Requires: python2-requests
%endif
-Requires: python%{?fedora:2}-requests
-Requires: python%{?fedora:2}-six
+%if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel}
<= 7)
+BuildRequires: pyxattr
Requires: pyxattr
-Requires: python%{?fedora:2}-enum34
+%else
+BuildRequires: python2-pyxattr
+Requires: python2-pyxattr
+%endif
+Requires: python2-six
# this is the only way to create containers right now
Requires: docker
-%if 0%{?fedora}
-# these are optional but still recommended
-Recommends: source-to-image
-Recommends: acl
-Recommends: atomic
-Recommends: libselinux-utils
-%else
+%if 0%{?rhel} && 0%{?rhel} <= 7
# no s2i on centos :<
# Requires: source-to-image
Requires: acl
Requires: atomic
Requires: libselinux-utils
+%else
+# these are optional but still recommended
+Recommends: source-to-image
+Recommends: acl
+Recommends: atomic
+Recommends: libselinux-utils
%endif
+
%description -n python2-%{pypi_name}
`conu` is a library which makes it easy to write tests for your containers
and is handy when playing with containers inside your code.
It defines an API to access and manipulate containers,
images and provides more, very helpful functions.
-
%if %{with python3}
%package -n python3-%{pypi_name}
Summary: %{summary}
%{?python_provide:%python_provide python3-%{pypi_name}}
-
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
Requires: python3-docker
Requires: python3-requests
-Requires: python3-six
Requires: python3-pyxattr
-Requires: source-to-image
-Requires: pyxattr
+Requires: python3-six
# this is the only way to create containers right now
Requires: docker
# these are optional but still recommended
@@ -96,6 +93,7 @@ Recommends: source-to-image
Recommends: acl
Recommends: atomic
Recommends: libselinux-utils
+
%description -n python3-%{pypi_name}
`conu` is a library which makes it easy to write tests for your containers
and is handy when playing with containers inside your code.
@@ -103,9 +101,10 @@ It defines an API to access and manipulate containers,
images and provides more, very helpful functions.
%endif
-
%package -n %{pypi_name}-doc
Summary: conu documentation
+BuildRequires: %{_bindir}/sphinx-build
+
%description -n %{pypi_name}-doc
Documentation for conu.
@@ -133,16 +132,16 @@ rm -rf html/.{doctrees,buildinfo}
%files -n python2-%{pypi_name}
%license LICENSE
%doc README.md
-%{python2_sitelib}/%{pypi_name}
-%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+%{python2_sitelib}/%{pypi_name}/
+%{python2_sitelib}/%{pypi_name}-*.egg-info/
%exclude %{python2_sitelib}/tests
%if %{with python3}
%files -n python3-%{pypi_name}
%license LICENSE
%doc README.md
-%{python3_sitelib}/%{pypi_name}
-%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+%{python3_sitelib}/%{pypi_name}/
+%{python3_sitelib}/%{pypi_name}-*.egg-info/
%exclude %{python3_sitelib}/tests
%endif
commit 27157dc68624007e61fbfda003f3cf57890826f2
Author: Jan Koscielniak <jkosciel(a)redhat.com>
Date: Tue Feb 6 19:43:42 2018 +0100
Initital import (#1542561).
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c9d1ea5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/conu-0.2.0.tar.gz
diff --git a/README.md b/README.md
deleted file mode 100644
index ddb7032..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# conu
-
-The conu package
\ No newline at end of file
diff --git a/conu.spec b/conu.spec
new file mode 100644
index 0000000..7a216cc
--- /dev/null
+++ b/conu.spec
@@ -0,0 +1,158 @@
+%global pypi_name conu
+
+%if 0%{?fedora}
+%bcond_without python3
+%else
+%bcond_with python3
+%endif
+
+Name: %{pypi_name}
+Version: 0.2.0
+Release: 1%{?dist}
+Summary: library which makes it easy to write tests for your containers
+
+License: GPLv3+
+URL:
https://github.com/fedora-modularity/conu
+Source0:
https://files.pythonhosted.org/packages/source/c/%{pypi_name}/%{pypi_name...
+BuildArch: noarch
+
+BuildRequires: python2-devel
+BuildRequires: python2-setuptools
+
+# for docs
+%if 0%{?fedora}
+BuildRequires: python2-docker
+%else
+BuildRequires: python-docker-py
+%endif
+BuildRequires: python%{?fedora:2}-sphinx
+BuildRequires: pyxattr
+BuildRequires: python%{?fedora:2}-enum34
+
+%if %{with python3}
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+%endif
+
+%description
+`conu` is a library which makes it easy to write tests for your containers
+and is handy when playing with containers inside your code.
+It defines an API to access and manipulate containers,
+images and provides more, very helpful functions.
+
+
+%package -n python2-%{pypi_name}
+Summary: %{summary}
+%if 0%{?fedora}
+%{?python_provide:%python_provide python2-%{pypi_name}}
+%endif
+
+%if 0%{?fedora}
+Requires: python2-docker
+%else
+Requires: python-docker-py
+%endif
+Requires: python%{?fedora:2}-requests
+Requires: python%{?fedora:2}-six
+Requires: pyxattr
+Requires: python%{?fedora:2}-enum34
+# this is the only way to create containers right now
+Requires: docker
+%if 0%{?fedora}
+# these are optional but still recommended
+Recommends: source-to-image
+Recommends: acl
+Recommends: atomic
+Recommends: libselinux-utils
+%else
+# no s2i on centos :<
+# Requires: source-to-image
+Requires: acl
+Requires: atomic
+Requires: libselinux-utils
+%endif
+%description -n python2-%{pypi_name}
+`conu` is a library which makes it easy to write tests for your containers
+and is handy when playing with containers inside your code.
+It defines an API to access and manipulate containers,
+images and provides more, very helpful functions.
+
+
+%if %{with python3}
+%package -n python3-%{pypi_name}
+Summary: %{summary}
+%{?python_provide:%python_provide python3-%{pypi_name}}
+
+Requires: python3-docker
+Requires: python3-requests
+Requires: python3-six
+Requires: python3-pyxattr
+Requires: source-to-image
+Requires: pyxattr
+# this is the only way to create containers right now
+Requires: docker
+# these are optional but still recommended
+Recommends: source-to-image
+Recommends: acl
+Recommends: atomic
+Recommends: libselinux-utils
+%description -n python3-%{pypi_name}
+`conu` is a library which makes it easy to write tests for your containers
+and is handy when playing with containers inside your code.
+It defines an API to access and manipulate containers,
+images and provides more, very helpful functions.
+%endif
+
+
+%package -n %{pypi_name}-doc
+Summary: conu documentation
+%description -n %{pypi_name}-doc
+Documentation for conu.
+
+%prep
+%autosetup -n %{pypi_name}-%{version}
+# Remove bundled egg-info
+rm -rf %{pypi_name}.egg-info
+
+%build
+%py2_build
+%if %{with python3}
+%py3_build
+%endif
+# generate html docs
+PYTHONPATH="${PWD}:${PWD}/docs/" sphinx-build docs/source html
+# remove the sphinx-build leftovers
+rm -rf html/.{doctrees,buildinfo}
+
+%install
+%if %{with python3}
+%py3_install
+%endif
+%py2_install
+
+%files -n python2-%{pypi_name}
+%license LICENSE
+%doc README.md
+%{python2_sitelib}/%{pypi_name}
+%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+%exclude %{python2_sitelib}/tests
+
+%if %{with python3}
+%files -n python3-%{pypi_name}
+%license LICENSE
+%doc README.md
+%{python3_sitelib}/%{pypi_name}
+%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+%exclude %{python3_sitelib}/tests
+%endif
+
+%files -n %{pypi_name}-doc
+%doc html
+%license LICENSE
+
+%changelog
+* Thu Feb 01 2018 Tomas Tomecek <ttomecek(a)redhat.com> 0.2.0-1
+- 0.2.0 release
+
+* Wed Dec 06 2017 Tomas Tomecek <ttomecek(a)redhat.com> - 0.1.0-1
+- Initial package.
diff --git a/sources b/sources
new file mode 100644
index 0000000..f1857ca
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (conu-0.2.0.tar.gz) =
2a1f1e544e817372899fb27774919e51e61820e869d828d04228f253e9491fdb3e2ca68b34a4453a824be9e3e30a4a171f1eb729468ec5c536f1853df0a5260b