python/python-pysvn
SHA256
14
0
Fork 0
forked from pool/python-pysvn
Code Pull Requests Activity

Accepting request 142818 from devel:languages:python

Browse Source 
Removed openSUSE 11.4 spec file workarounds (forwarded request 142816 from TheBlackCat) (forwarded request 142817 from TheBlackCat)

OBS-URL: https://build.opensuse.org/request/show/142818
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pysvn?expand=0&rev=18
This commit is contained in:
Stephan Kulow
2012-11-28 13:34:33 +00:00
committed by Git OBS Bridge
parent e86867f8d0 f462592c3c
commit a2008e3b91
5 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
bnc780243_fix_build_script.diff Normal file
View File

@@ -0,0 +1,22 @@
Index: Source/setup_configure.py
===================================================================
--- Source/setup_configure.py (revision 1471)
+++ Source/setup_configure.py (revision 1472)
@@ -873,7 +873,7 @@
rules.append( '%s : %s' % (target_filename, ' '.join( all_objects )) )
rules.append( '\t@echo Link %s' % (target_filename,) )
- rules.append( '\t@%%(LDSHARED)s -o %s %%(CCCFLAGS)s %s' % (target_filename, ' '.join( all_objects )) )
+ rules.append( '\t@%%(LDSHARED)s -o %s %%(CCCFLAGS)s %s %%(LDLIBS)s' % (target_filename, ' '.join( all_objects )) )
self.makePrint( self.expand( '\n'.join( rules ) ) )
@@ -1154,7 +1154,7 @@
self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) )
self._addVar( 'LDLIBS', ' '.join( self._getLdLibs() ) )
- self._addVar( 'LDSHARED', '%(CCC)s -shared -g %(LDLIBS)s' )
+ self._addVar( 'LDSHARED', '%(CCC)s -shared -g' )
#--------------------------------------------------------------------------------
class LinuxCompilerGCC(UnixCompilerGCC):

5
python-pysvn.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Nov 22 11:17:40 UTC 2012 - robert.munteanu@gmail.com
- Added patch for bnc#780243, cherry-picked from upstream r1742
-------------------------------------------------------------------
Mon Apr 30 10:16:03 UTC 2012 - cfarrell@suse.com

2
python-pysvn.spec
View File

@@ -25,6 +25,7 @@ Group: Development/Libraries/Python
Url: http://pysvn.tigris.org
Source0: http://pysvn.barrys-emacs.org/source_kits/pysvn-%{version}.tar.gz
Patch0: bnc445431_pysvn_svnenv.cpp.diff
Patch1: bnc780243_fix_build_script.diff
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: libcom_err-devel
@@ -59,6 +60,7 @@ Features:
%prep
%setup -q -n pysvn-%{version}
%patch0 -p0
%patch1 -p0
# patch in rpm compiler flags
sed -i 's/CCFLAGS=-Wall/CCFLAGS=$(RPM_OPT_FLAGS) -Wall -Wno-deprecated/g' Source/setup_configure.py

10
python3-pysvn.changes
View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Nov 22 14:28:33 UTC 2012 - toddrme2178@gmail.com
- Removed openSUSE 11.4 spec file workarounds
-------------------------------------------------------------------
Thu Nov 22 11:17:40 UTC 2012 - robert.munteanu@gmail.com
- Added patch for bnc#780243, cherry-picked from upstream r1742
-------------------------------------------------------------------
Mon Apr 30 10:16:03 UTC 2012 - cfarrell@suse.com

8
python3-pysvn.spec
View File

@@ -25,6 +25,7 @@ Group: Development/Libraries/Python
Url: http://pysvn.tigris.org
Source0: http://pysvn.barrys-emacs.org/source_kits/pysvn-%{version}.tar.gz
Patch0: bnc445431_pysvn_svnenv.cpp.diff
Patch1: bnc780243_fix_build_script.diff
BuildRequires: gcc-c++
BuildRequires: libcom_err-devel
BuildRequires: libexpat-devel
@@ -37,13 +38,9 @@ BuildRequires: python3-xml
BuildRequires: subversion-devel
BuildRequires: pkgconfig(apr-1)
Requires: neon
Requires: python(abi) = %{py3_ver}
Requires: subversion
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} <= 1140
%{!?python3_sitearch: %global python3_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%{!?py3_ver: %global py3_ver %(python3 -c "import sys; version=str(sys.version_info[0]) + '.' + str(sys.version_info[1]); print(version)" 2>/dev/null || echo PYTHON-NOT-FOUND)}
%endif
Requires: python3 >= %{py3_ver}
%description
pysvn is a highlevel and easy to use Python bindings to Subversion. The pysvn
@@ -62,6 +59,7 @@ Features:
%prep
%setup -q -n pysvn-%{version}
%patch0 -p0
%patch1 -p0
# patch in rpm compiler flags
sed -i 's/CCFLAGS=-Wall/CCFLAGS=$(RPM_OPT_FLAGS) -Wall -Wno-deprecated/g' Source/setup_configure.py