rpms/pysvn/F-9 pysvn-1.6.1-drop-version.patch, 1.1, 1.2 pysvn.spec, 1.2, 1.3
Caitlyn O'Hanna
ravenoak at fedoraproject.org
Sun Oct 12 04:38:30 UTC 2008
Author: ravenoak
Update of /cvs/pkgs/rpms/pysvn/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13518
Modified Files:
pysvn-1.6.1-drop-version.patch pysvn.spec
Log Message:
Had to fix module versioning in __init__. Re-enabled tests for < F10
pysvn-1.6.1-drop-version.patch:
Index: pysvn-1.6.1-drop-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pysvn/F-9/pysvn-1.6.1-drop-version.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pysvn-1.6.1-drop-version.patch 6 Oct 2008 21:18:27 -0000 1.1
+++ pysvn-1.6.1-drop-version.patch 12 Oct 2008 04:37:59 -0000 1.2
@@ -96,3 +96,16 @@
else:
raise ImportError( 'Fix pysvn/__init__.py to support python %d.%d' % tuple(maj_min) )
+--- ./Source/create__init__.py.orig 2008-10-11 21:21:07.000000000 -0700
++++ ./Source/create__init__.py 2008-10-11 21:23:13.000000000 -0700
+@@ -12,8 +12,8 @@
+ block_end_index = pysvn__init__file_contents.index( '### IMPORT BLOCK END\n' ) + 1
+
+ pysvn__init__file_contents[ block_begin_index:block_end_index ] = [
+- ' import _pysvn_%d_%d\n' % (pymaj, pymin),
+- ' _pysvn = _pysvn_%d_%d\n' % (pymaj, pymin),
++ ' #import _pysvn_%d_%d\n' % (pymaj, pymin),
++ ' #_pysvn = _pysvn_%d_%d\n' % (pymaj, pymin),
+ ]
+
+ f = file( sys.argv[2], 'w' )
Index: pysvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pysvn/F-9/pysvn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pysvn.spec 6 Oct 2008 21:16:55 -0000 1.2
+++ pysvn.spec 12 Oct 2008 04:37:59 -0000 1.3
@@ -2,7 +2,7 @@
Name: pysvn
Version: 1.6.1
-Release: 1%{dist}
+Release: 2%{dist}
Summary: Pythonic style bindings for Subversion
Group: Development/Languages
License: ASL 1.1
@@ -28,7 +28,7 @@
%patch0
%patch1
# Broken for F10, possibly because of subversion 1.5
-#%patch2 -p1
+%patch2 -p1
%build
pushd Source
@@ -43,9 +43,9 @@
%{__install} -p -m 644 Source/pysvn/__init__.py %{buildroot}%{python_sitearch}/%{name}
%{__install} -p -m 755 Source/pysvn/_pysvn.so %{buildroot}%{python_sitearch}/%{name}
-#%check
-#pushd Tests
-#%{__make} %{?_smp_mflags}
+%check
+pushd Tests
+%{__make} %{?_smp_mflags}
%clean
%{__rm} -rf %{buildroot}
@@ -59,6 +59,10 @@
%{python_sitearch}/%{name}
%changelog
+* Sat Oct 11 2008 Caitlyn O'Hanna <ravenoak at virtualxistenz.com> - 1.6.1-2
+- Grrr, __init__.py still had some module versioning in it...killed it
+- Renabled tests for versions < F10
+
* Mon Oct 06 2008 Caitlyn O'Hanna <ravenoak at virtualxistenz.com> - 1.6.1-1
- Update to 1.6.1, fix F10 FBFS
- Disabled tests, might be because of subversion 1.5
More information about the fedora-extras-commits
mailing list