[python-sure/epel7] Revert "Update to version 1.2.7" - this was supposed to be done in Fedora rawhide
Bohuslav Kabrda
bkabrda at fedoraproject.org
Fri Nov 14 12:17:21 UTC 2014
commit c58db0337f991821990b0b6ef806738e5982c18b
Author: Slavek Kabrda <bkabrda at redhat.com>
Date: Fri Nov 14 13:16:42 2014 +0100
Revert "Update to version 1.2.7" - this was supposed to be done in Fedora rawhide
This reverts commit 2995ac02a921c540861709dcbc87660029245b02.
.gitignore | 2 -
python-sure.spec | 60 ++++-------------------------------------------------
sources | 4 +-
3 files changed, 7 insertions(+), 59 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1c15b4b..9518655 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,3 @@
/sure-1.0.6-tests.tgz
/sure-1.1.7-tests.tgz
/sure-1.1.7.tar.gz
-/sure-1.2.7.tar.gz
-/sure-1.2.7-tests.tgz
diff --git a/python-sure.spec b/python-sure.spec
index 5514c01..af8fcd2 100644
--- a/python-sure.spec
+++ b/python-sure.spec
@@ -1,10 +1,8 @@
# Created by pyp2rpm-0.5.1
%global pypi_name sure
-%global with_python3 1
-
Name: python-%{pypi_name}
-Version: 1.2.7
+Version: 1.1.7
Release: 1%{?dist}
Summary: Assertion toolbox for python
@@ -16,37 +14,17 @@ Source0: http://pypi.python.org/packages/source/s/%{pypi_name}/%{pypi_nam
Source1: https://raw.github.com/gabrielfalcao/sure/master/COPYING
# To get tests:
# git clone https://github.com/gabrielfalcao/sure.git && cd sure
-# git checkout 9fe8fd0 && tar czf sure-1.2.7-tests.tgz tests/
+# git checkout 1.1.7 && tar czf sure-1.1.7-tests.tgz tests/
Source2: %{pypi_name}-%{version}-tests.tgz
BuildArch: noarch
BuildRequires: python2-devel
-BuildRequires: python-mock
BuildRequires: python-nose
BuildRequires: python-setuptools
-BuildRequires: python-six
-Requires: python-six
-
-%if 0%{?with_python3}
-BuildRequires: python3-devel
-BuildRequires: python3-mock
-BuildRequires: python3-nose
-BuildRequires: python3-setuptools
-BuildRequires: python3-six
-%endif
%description
A Python assertion toolbox that works fine with nose.
-%if 0%{?with_python3}
-%package -n python3-sure
-Summary: Assertion toolbox for python
-Requires: python3-six
-
-%description -n python3-sure
-A Python assertion toolbox that works fine with nose. This package contains
-Python 3 build.
-%endif
%prep
%setup -q -n %{pypi_name}-%{version}
@@ -54,54 +32,26 @@ Python 3 build.
rm -rf %{pypi_name}.egg-info
cp %{SOURCE1} .
-%if 0%{?with_python3}
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-%endif
%build
%{__python} setup.py build
-%if 0%{?with_python3}
-pushd %{py3dir}
-LANG=en_US.utf8 %{__python3} setup.py build
-popd
-%endif
+
%install
-%if 0%{?with_python3}
-pushd %{py3dir}
-LANG=en_US.utf8 %{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-popd
-%endif
%{__python} setup.py install --skip-build --root %{buildroot}
+
%check
tar xzf %{SOURCE2}
nosetests
-%if 0%{?with_python3}
-pushd %{py3dir}
-tar xzf %{SOURCE2}
-nosetests-%{python3_version}
-popd
-%endif
+
%files
%doc COPYING
%{python_sitelib}/%{pypi_name}
%{python_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
-%if 0%{?with_python3}
-%files -n python3-sure
-%doc COPYING
-%{python3_sitelib}/%{pypi_name}
-%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
-%endif
-
%changelog
-* Fri Nov 14 2014 Slavek Kabrda <bkabrda at redhat.com> - 1.2.7-1
-- Update to version 1.2.7
-- Add python3- subpackage
-
* Mon Feb 18 2013 Bohuslav Kabrda <bkabrda at redhat.com> - 1.1.7-1
- Update to 1.1.7.
- License change from MIT to GPLv3.
diff --git a/sources b/sources
index d235f5e..0214474 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6dbecef27dffc41c8cd8aab8a8b3fdfb sure-1.2.7.tar.gz
-1a270f3313f6078cf117f7240c5fc997 sure-1.2.7-tests.tgz
+90a83e149c6dd79f109f5b6686027dc2 sure-1.1.7-tests.tgz
+4d95a2118175b8ca56a82c85505a8ebf sure-1.1.7.tar.gz
More information about the scm-commits
mailing list