From 587b25db49be23377f50c54c954fbdfb81ef33c9 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Jun 27 2011 00:54:31 +0000
Subject: New upstream release 1.7.5

Do not generate library with --rpath
Apply upstream patch for test fixes against subversion 1.6.17

---

diff --git a/.gitignore b/.gitignore
index db18ad9..a9c64d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 pysvn-1.6.3.tar.gz
+/pysvn-1.7.5.tar.gz
diff --git a/allow-norpath.patch b/allow-norpath.patch
new file mode 100644
index 0000000..f90af9a
--- /dev/null
+++ b/allow-norpath.patch
@@ -0,0 +1,22 @@
+--- Source/setup_configure.py.old	2010-12-31 08:19:01.000000000 -0500
++++ Source/setup_configure.py	2011-06-22 21:07:07.311172602 -0400
+@@ -322,9 +322,6 @@
+             'mac_os_x_arch':    self.mac_os_x_arch
+             }
+ 
+-        if not self.checkAllOptionsUsed():
+-            return 1
+-
+         print( 'Info: Creating Makefile for Source' )
+ 
+         major, minor, patch = self.getSvnVersion( svn_include )
+@@ -419,6 +416,9 @@
+                 print( 'Info: Using unix makefile template' )
+             makefile.write( self.makefile_template % template_values )
+ 
++        if not self.checkAllOptionsUsed():
++            return 1
++
+         f = open( 'pysvn_common.mak', 'r' )
+         makefile.write( f.read() % template_values )
+         f.close()
diff --git a/pysvn-test.patch b/pysvn-test.patch
new file mode 100644
index 0000000..3830ac9
--- /dev/null
+++ b/pysvn-test.patch
@@ -0,0 +1,33 @@
+Index: Extension/Tests/benchmark_diff.py
+===================================================================
+--- Extension/Tests/benchmark_diff.py	(revision 1369)
++++ Extension/Tests/benchmark_diff.py	(working copy)
+@@ -1,6 +1,6 @@
+ '''
+  ====================================================================
+- Copyright (c) 2005-2011 Barry A Scott.  All rights reserved.
++ Copyright (c) 2005-2009 Barry A Scott.  All rights reserved.
+ 
+  This software is licensed as described in the file LICENSE.txt,
+  which you should have received as part of this distribution.
+@@ -78,9 +78,7 @@
+         dateUnixLs2_re = re.compile(r'[JFMASOND][a-z][a-z]  \d\d\d\d')
+         uuid_re = re.compile(r'[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}')
+         checksum_re = re.compile(r'[0-9a-z]{32}')
+-        tmpSvnFile_re = re.compile(r'/.svn/tmp/tempfile.\d+.tmp|/.svn/tmp/svn-[a-zA-Z0-9]+')
+ 
+-
+         self.replacement_list = [
+                         (dateAlphaNumeric_re,          '<alpha-date-and-time>'),
+                         (dateNumeric_re,               '<numeric-date-and-time>'),
+@@ -88,9 +86,9 @@
+                         (checksum_re,                  '<checksum>'),
+                         (dateUnixLs1_re,               '<ls-date-and-time>'),
+                         (dateUnixLs2_re,               '<ls-date-and-time>'),
+-                        (tmpSvnFile_re,                '/.svn/tmp/<svn-tempfile>'),
+                         ]
+ 
++
+         if self.workdir:
+             workdir_re1 = LiteralCaseBlindSearch( self.workdir )
+             workdir_re2 = LiteralCaseBlindSearch( os.path.realpath( self.workdir ) )
diff --git a/pysvn.spec b/pysvn.spec
index b39c4dd..17b9562 100644
--- a/pysvn.spec
+++ b/pysvn.spec
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pysvn
-Version:        1.7.2
-Release:        2%{dist}
+Version:        1.7.5
+Release:        1%{dist}
 Summary:        Pythonic style bindings for Subversion
 Group:          Development/Languages
 License:        ASL 1.1
@@ -17,15 +17,21 @@ BuildRequires:  neon-devel
 BuildRequires:  apr-devel
 BuildRequires:  openssl-devel
 
+# PATCHES #
+Patch0001: allow-norpath.patch
+Patch0002: pysvn-test.patch
+
 %description
 Pythonic style bindings for Subversion
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0001 -p0
+%patch0002 -p1 -R
 
 %build
 pushd Source
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py configure --enable-debug --verbose --fixed-module-name
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py configure --enable-debug --verbose --fixed-module-name --norpath
 %{__sed} -i -e 's/-Wall -fPIC -fexceptions -frtti/%{optflags} -fPIC -frtti/' Makefile
 %{__make} %{?_smp_mflags}
 
@@ -51,6 +57,11 @@ pushd Tests
 %{python_sitearch}/%{name}
 
 %changelog
+* Sun Jun 26 2011 Stephen Gallagher <sgallagh@redhat.com> - 1.7.5-1.2
+- New upstream release 1.7.5
+- Do not generate library with --rpath
+- Apply upstream patch for test fixes against subversion 1.6.17
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index a8dfc3f..765d025 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b557a12bc34f0d6805e259d69b9f38ce  pysvn-1.7.2.tar.gz
+3334718248ec667b17d333aac73d5680  pysvn-1.7.5.tar.gz