orion pushed to python-pkgconfig (master). "Add BR on python-nose (..more)"

[notifications at fedoraproject.org]

From 3f1c0885e1a52287b56533e59b27637403d8e223 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at cora.nwra.com>
Date: Mon, 18 May 2015 12:04:49 -0600
Subject: Add BR on python-nose Combined build


diff --git a/python-pkgconfig.spec b/python-pkgconfig.spec
index ba9348d..f8aa1cb 100644
--- a/python-pkgconfig.spec
+++ b/python-pkgconfig.spec
@@ -13,6 +13,8 @@ Source0:        https://github.com/matze/%{srcname}/archive/v%{version}.tar.gz#/
 BuildArch:      noarch
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
+# For tests
+BuildRequires:  python-nose
 
 %description
 pkgconfig is a Python module to interface with the pkg-config command line
@@ -31,6 +33,8 @@ If pkg-config is not on the path, raises EnvironmentError.
 Summary:        A Python3 interface to the pkg-config command line tool
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
+# For tests
+BuildRequires:  python3-nose
 
 %description -n python3-%{srcname}
 pkgconfig is a Python3 module to interface with the pkg-config command line
@@ -46,53 +50,41 @@ It can be used to
 If pkg-config is not on the path, raises EnvironmentError.
 
 %prep
-%setup -qc
-mv %{srcname}-%{version} python2
+%setup -q -n %{srcname}-%{version}
 # Strip shbang
 find -name \*.py | xargs sed -i '/^#!\/usr\/bin\/.*python/d'
-cp -a python2 python3
-#2to3 --write --nobackups python3
 
 
 %build
-pushd python2
 %{__python2} setup.py build
-popd
-pushd python3
 %{__python3} setup.py build
-popd
 
 
 %install
-pushd python3
 %{__python3} setup.py install --skip-build --root %{buildroot}
-popd
-
-pushd python2
 %{__python2} setup.py install --skip-build --root %{buildroot}
-popd
 
 
 %check
-pushd python2
 %{__python2} setup.py test
-popd
-pushd python3
 %{__python3} setup.py test
-popd
 
  
 %files
-%license python2/LICENSE
-%doc python2/README.rst
+%license LICENSE
+%doc README.rst
 %{python2_sitelib}/*
 
 %files -n python3-%{srcname}
-%license python3/LICENSE
-%doc python3/README.rst
+%license LICENSE
+%doc README.rst
 %{python3_sitelib}/*
 
 
 %changelog
+* Mon May 18 2015 Orion Poplawski <orion at cora.nwra.com> - 1.1.0-1
+- Add BR on python-nose
+- Combined build
+
 * Sun May 17 2015 Orion Poplawski <orion at cora.nwra.com> - 1.1.0-1
 - Initial package
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-pkgconfig.git/commit/?h=master&id=3f1c0885e1a52287b56533e59b27637403d8e223