[packages/python-pysvn] up to 1.7.10

[glen]

commit 26a9f6f8407c24da854f5899a9054026cdf0c8e8
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Mar 30 07:41:31 2016 +0300

    up to 1.7.10

 python-pysvn-apr-util.patch | 38 --------------------------------------
 python-pysvn.spec           | 19 ++++++++++---------
 x32.patch                   | 11 -----------
 3 files changed, 10 insertions(+), 58 deletions(-)
---
diff --git a/python-pysvn.spec b/python-pysvn.spec
index e95ad37..232f1e3 100644
--- a/python-pysvn.spec
+++ b/python-pysvn.spec
@@ -1,16 +1,19 @@
-%bcond_with	tests
+# NOTE
+# - The GUI is packaged in pysvn-workbench.spec
+#
+# Conditional build:
+%bcond_with	tests		# build with tests
 
 %define	module	pysvn
 Summary:	Python SVN Tools
 Summary(pl.UTF-8):	Narzędzia do SVN w Pythonie
 Name:		python-%{module}
-Version:	1.7.6
-Release:	3
+Version:	1.7.10
+Release:	1
 License:	Apache
 Group:		Development/Languages/Python
 Source0:	http://pysvn.barrys-emacs.org/source_kits/%{module}-%{version}.tar.gz
-# Source0-md5:	010a80f0058713209d62e96b20afbde9
-Patch0:		%{name}-apr-util.patch
+# Source0-md5:	bf7527591d5086bd6d01cdc0d09a076e
 Patch1:		x32.patch
 URL:		http://pysvn.tigris.org/
 BuildRequires:	apr-devel
@@ -21,7 +24,6 @@ BuildRequires:	python-devel
 BuildRequires:	rpm-pythonprov
 BuildRequires:	subversion
 BuildRequires:	subversion-devel
-%pyrequires_eq	python
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -46,7 +48,6 @@ Cechy pysvn:
 
 %prep
 %setup  -q -n %{module}-%{version}
-%patch0 -p1
 %patch1 -p1
 
 %build
@@ -66,9 +67,9 @@ cd Source
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{py_sitedir}/pysvn
 
-install Source/pysvn/__init__.py Source/pysvn/*.so $RPM_BUILD_ROOT%{py_sitedir}/pysvn
+cp -a Source/pysvn/__init__.py Source/pysvn/*.so $RPM_BUILD_ROOT%{py_sitedir}/pysvn
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/Client
-install Examples/Client/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/Client
+cp -p Examples/Client/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/Client
 
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
diff --git a/python-pysvn-apr-util.patch b/python-pysvn-apr-util.patch
deleted file mode 100644
index dade394..0000000
--- a/python-pysvn-apr-util.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- pysvn-1.7.6/Source/setup_configure.py~	2012-02-28 19:53:48.000000000 +0100
-+++ pysvn-1.7.6/Source/setup_configure.py	2012-11-19 12:17:41.602482671 +0100
-@@ -1017,7 +1017,7 @@
-                                         '-g  '
-                                         '-no-long-double '
-                                         '-Wall -fPIC -fexceptions -frtti '
--                                        '-I. -I%(APR_INC)s -I%(SVN_INC)s '
-+                                        '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
-                                         '-D%(DEBUG)s' )
-         self._addVar( 'LDEXE',          '%(CCC)s -g' )
- 
-@@ -1034,7 +1034,7 @@
-                     '-g',
-                     '-no-long-double',
-                     '-Wall -fPIC -fexceptions -frtti',
--                    '-I. -I%(APR_INC)s -I%(SVN_INC)s',
-+                    '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s',
-                     '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s',
-                     '-D%(DEBUG)s',
-                     ]
-@@ -1126,7 +1126,7 @@
-         self._addVar( 'CCCFLAGS',
-                                         '-g  '
-                                         '-Wall -fPIC -fexceptions -frtti '
--                                        '-I. -I%(APR_INC)s -I%(SVN_INC)s '
-+                                        '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
-                                         '-D%(DEBUG)s' )
-         self._addVar( 'LDEXE',          '%(CCC)s -g' )
- 
-@@ -1139,7 +1139,7 @@
- 
-         py_cflags_list = [
-                     '-Wall -fPIC -fexceptions -frtti',
--                    '-I. -I%(APR_INC)s -I%(SVN_INC)s',
-+                    '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s',
-                     '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s',
-                     '-D%(DEBUG)s',
-                     ]
diff --git a/x32.patch b/x32.patch
index d6476a1..f59450e 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,16 +1,5 @@
 --- pysvn-1.7.6/Source/setup_configure.py~	2015-05-10 15:38:50.000000000 +0200
 +++ pysvn-1.7.6/Source/setup_configure.py	2015-05-10 15:42:08.032391956 +0200
-@@ -977,8 +977,10 @@
-         self._find_paths_svn_lib = [
-                         '/opt/local/lib',                       # Darwin - darwin ports
-                         '/sw/lib',                              # Darwin - Fink
-+                        '/usr/libx32',                           # typical 64bit Linux
-                         '/usr/lib64',                           # typical 64bit Linux
-                         '/usr/lib',                             # typical Linux
-+                        '/usr/local/libx32',                     # typical 64bit Linux
-                         '/usr/local/lib64',                     # typical 64bit Linux
-                         '/usr/local/lib',                       # typical *BSD
-                         '/usr/pkg/lib',                         # netbsd
 @@ -999,8 +1001,10 @@
          self._find_paths_apr_lib = [
                          '/opt/local/lib',                       # Darwin - darwin ports
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-pysvn.git/commitdiff/05c1fffed23f248a640e8a2129f197b153c530d2