[packages/python-pysvn] - updated to 1.7.6 - add apr-util include dir to C*FLAGS

baggins baggins at pld-linux.org
Mon Nov 19 12:19:09 CET 2012


commit cb503a76295443971797456df24cadb68e37baa5
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Nov 19 12:18:41 2012 +0100

    - updated to 1.7.6
    - add apr-util include dir to C*FLAGS

 python-pysvn-apr-util.patch | 38 ++++++++++++++++++++++++++++++++++++++
 python-pysvn.spec           | 13 +++++++++----
 2 files changed, 47 insertions(+), 4 deletions(-)
---
diff --git a/python-pysvn.spec b/python-pysvn.spec
index 34ecbd8..f99fedb 100644
--- a/python-pysvn.spec
+++ b/python-pysvn.spec
@@ -4,14 +4,16 @@
 Summary:	Python SVN Tools
 Summary(pl.UTF-8):	Narzędzia do SVN w Pythonie
 Name:		python-%{module}
-Version:	1.7.2
-Release:	3
+Version:	1.7.6
+Release:	1
 License:	Apache
 Group:		Development/Languages/Python
 Source0:	http://pysvn.barrys-emacs.org/source_kits/%{module}-%{version}.tar.gz
-# Source0-md5:	b557a12bc34f0d6805e259d69b9f38ce
+# Source0-md5:	010a80f0058713209d62e96b20afbde9
+Patch0:		%{name}-apr-util.patch
 URL:		http://pysvn.tigris.org/
 BuildRequires:	apr-devel
+BuildRequires:	apr-util-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	pkgconfig
 BuildRequires:	python-devel
@@ -43,14 +45,17 @@ Cechy pysvn:
 
 %prep
 %setup  -q -n %{module}-%{version}
+%patch0 -p1
 
 %build
 cd Source
 %{__python} ./setup.py configure \
 	--apr-inc-dir="$(apr-1-config --includedir)" \
+	--apu-inc-dir="$(apu-1-config --includedir)" \
 	--svn-lib-dir=%{_libdir}
+
 %{__make} \
-	CC="%{__cc} -c" \
+	CC="%{__cc} -c $(pkg-config apr-util-1 --cflags)" \
 	CCC="%{__cxx} -c $(pkg-config apr-util-1 --cflags)"
 
 %{?with_tests:%{__make} -C ../Tests -f unix.mak PYTHON=%{__python}}
diff --git a/python-pysvn-apr-util.patch b/python-pysvn-apr-util.patch
new file mode 100644
index 0000000..dade394
--- /dev/null
+++ b/python-pysvn-apr-util.patch
@@ -0,0 +1,38 @@
+--- 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',
+                     ]
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list