rpms/pysvn/devel pysvn-1.6.2-fix-benchmark.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 pysvn.spec, 1.3, 1.4 sources, 1.3, 1.4 pysvn-1.5.2-drop-version.patch, 1.1, NONE pysvn-1.5.2-remove-rpath.patch, 1.1, NONE pysvn-1.5.2-tests-temp_fix.patch, 1.1, NONE pysvn-1.5.3-remove-rpath.patch, 1.1, NONE pysvn-1.6.1-drop-version.patch, 1.2, NONE

[Caitlyn O'Hanna]

Author: ravenoak

Update of /cvs/pkgs/rpms/pysvn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3020

Modified Files:
	.cvsignore pysvn.spec sources 
Added Files:
	pysvn-1.6.2-fix-benchmark.patch 
Removed Files:
	pysvn-1.5.2-drop-version.patch pysvn-1.5.2-remove-rpath.patch 
	pysvn-1.5.2-tests-temp_fix.patch 
	pysvn-1.5.3-remove-rpath.patch pysvn-1.6.1-drop-version.patch 
Log Message:
Update to 1.6.2, fixes the need for some patches


pysvn-1.6.2-fix-benchmark.patch:

--- NEW FILE pysvn-1.6.2-fix-benchmark.patch ---
--- Tests/benchmark_diff.py   (revision 1071)
+++ Tests/benchmark_diff.py   (working copy)
@@ -54,9 +54,6 @@
         self.workdir = self.find( 'WorkDir' )
         self.python = self.find( 'PYTHON' )
         self.username = self.find( 'Username' )
-        self.username_spaces = self.username
-        while len(self.username_spaces) < 10:
-            self.username_spaces = self.username_spaces + ' '
 
         # ------------------------------------------------------------------------
         # Version strings:
@@ -105,9 +102,9 @@
 
         if True:
             # must replace username after workdir
-            username_spaces_re = re.compile( r'\b'+self.username_spaces )
+            username_spaces_re = re.compile( r'\b'+self.username+' * ' )
             self.replacement_list.append(
-                    (username_spaces_re,        '<username>') )
+                    (username_spaces_re,        '<username> ') )
 
             username_re = re.compile( r': %s\b' % self.username )
             self.replacement_list.append( (username_re,                  ': <username>') )



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pysvn/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2008 20:01:52 -0000	1.3
+++ .cvsignore	28 Oct 2008 18:16:53 -0000	1.4
@@ -1 +1 @@
-pysvn-1.6.1.tar.gz
+pysvn-1.6.2.tar.gz


Index: pysvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pysvn/devel/pysvn.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pysvn.spec	12 Oct 2008 04:58:12 -0000	1.3
+++ pysvn.spec	28 Oct 2008 18:16:53 -0000	1.4
@@ -1,16 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pysvn
-Version:        1.6.1
-Release:        2%{dist}
+Version:        1.6.2
+Release:        1%{dist}
 Summary:        Pythonic style bindings for Subversion
 Group:          Development/Languages
 License:        ASL 1.1
 URL:            http://pysvn.tigris.org/
 Source0:        http://pysvn.barrys-emacs.org/source_kits/%{name}-%{version}.tar.gz
-Patch0:         pysvn-1.5.3-remove-rpath.patch
-Patch1:         pysvn-1.6.1-drop-version.patch
-Patch2:         pysvn-1.5.2-tests-temp_fix.patch
+Patch0:         pysvn-1.6.2-fix-benchmark.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel
 BuildRequires:  PyXML
@@ -26,15 +24,12 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0
-%patch1
-# Broken for F10, possibly because of subversion 1.5
-#%patch2 -p1
 
 %build
 pushd Source
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py configure --enable-debug --verbose
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py configure --enable-debug --verbose --norpath --fixed-module-name
 # Set correct build flags
-%{__sed} -i -e 's/-Wall -fPIC -fexceptions -frtti/%{optflags} -fPIC/' Makefile
+%{__sed} -i -e 's/-Wall -fPIC -fexceptions -frtti/%{optflags} -fPIC -frtti/' Makefile
 %{__make} %{?_smp_mflags}
 
 %install
@@ -43,9 +38,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 +54,10 @@
 %{python_sitearch}/%{name}
 
 %changelog
+* Tue Oct 28 2008 Caitlyn O'Hanna <ravenoak at virtualxistenz.com> - 1.6.2-1
+- Upstream to 1.6.2, upstream provided some build fixes to remove patches
+-   (Thanks Barry!).  Re-enabled testing with provided patch to fix whitespace
+
 * Sat Oct 11 2008 Caitlyn O'Hanna <ravenoak at virtualxistenz.com> - 1.6.1-2
 - Fixed lingering module versioning in __init__
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pysvn/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2008 20:01:52 -0000	1.3
+++ sources	28 Oct 2008 18:16:53 -0000	1.4
@@ -1 +1 @@
-7beed40705669fdc802c07b011b61730  pysvn-1.6.1.tar.gz
+58bb216b815f3c05ed77f70708515355  pysvn-1.6.2.tar.gz


--- pysvn-1.5.2-drop-version.patch DELETED ---


--- pysvn-1.5.2-remove-rpath.patch DELETED ---


--- pysvn-1.5.2-tests-temp_fix.patch DELETED ---


--- pysvn-1.5.3-remove-rpath.patch DELETED ---


--- pysvn-1.6.1-drop-version.patch DELETED ---