[packages/yum] add nosetest version suffix

glen glen at pld-linux.org
Sat Mar 2 20:26:31 CET 2013


commit f9d99ab34c8db62f436543e0f67d8d0ef25927b6
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Mar 2 21:25:35 2013 +0200

    add nosetest version suffix

 nosetests.patch | 34 ++++++++++++++++++++++++++++++++++
 yum.spec        |  7 +++++--
 2 files changed, 39 insertions(+), 2 deletions(-)
---
diff --git a/yum.spec b/yum.spec
index 71bc847..c6bff9c 100644
--- a/yum.spec
+++ b/yum.spec
@@ -14,7 +14,7 @@ Summary:	RPM installer/updater
 Summary(pl.UTF-8):	Narzędzie do instalowania/uaktualniania pakietów RPM
 Name:		yum
 Version:	3.4.3
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/System
 Source0:	http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -27,6 +27,7 @@ Patch1:		%{name}-obsoletes.patch
 Patch3:		%{name}-pld.patch
 Patch4:		%{name}-amd64.patch
 Patch5:		%{name}-config.patch
+Patch6:		nosetests.patch
 # fc
 Patch10:	installonlyn-enable.patch
 Patch11:	%{name}-mirror-priority.patch
@@ -83,6 +84,7 @@ zapytaniu użytkownika w razie potrzeby.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{__make}
@@ -100,7 +102,8 @@ test $ver = %{version}
 
 # test/check-po-yes-no.py prints chinese to screen, need to enable utf8
 export LC_ALL=en_US.utf8
-%{__make} test
+%{__make} test \
+	NOSETESTS=nosetests-%{py_ver}
 %endif
 
 %install
diff --git a/nosetests.patch b/nosetests.patch
new file mode 100644
index 0000000..a1efb52
--- /dev/null
+++ b/nosetests.patch
@@ -0,0 +1,34 @@
+--- yum-3.4.3/Makefile~	2011-06-28 23:27:22.000000000 +0300
++++ yum-3.4.3/Makefile	2013-03-02 21:23:54.119843970 +0200
+@@ -8,6 +8,7 @@
+ RELEASE=$(shell awk '/Release:/ { print $$2 }' ${PKGNAME}.spec)
+ CVSTAG=yum-$(subst .,_,$(VERSION)-$(RELEASE))
+ PYTHON=python
++NOSETESTS=nosetests
+ WEBHOST = yum.baseurl.org
+ WEB_DOC_PATH = /srv/projects/yum/web/download/docs/yum-api/
+ 
+@@ -62,12 +63,12 @@
+ 	epydoc --check $(DOCS)
+ 
+ test:
+-	@nosetests -i ".*test" test
++	@$(NOSETESTS) -i ".*test" test
+ 	- at test/check-po-yes-no.py
+ 	cd po; make test
+ 
+ test-skipbroken:
+-	@nosetests -i ".*test" test/skipbroken-tests.py
++	@$(NOSETESTS) -i ".*test" test/skipbroken-tests.py
+ 
+ check: test
+ 
+@@ -82,7 +83,7 @@
+ 	git log --since=2007-05-16 --pretty --numstat --summary | git2cl | cat > ChangeLog
+ 
+ testnewbehavior:
+-	@NEW_BEHAVIOR=1 nosetests -i ".*test" test
++	@NEW_BEHAVIOR=1 $(NOSETESTS) -i ".*test" test
+ 
+ archive: remove_spec = ${PKGNAME}-daily.spec
+ archive: _archive
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/yum.git/commitdiff/a4502cecbdc870a35d741bb776bc29412f0320a9



More information about the pld-cvs-commit mailing list