forked from pool/python-pysvn
Accepting request 142818 from devel:languages:python
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:
22
bnc780243_fix_build_script.diff
Normal file
22
bnc780243_fix_build_script.diff
Normal 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):
|
@@ -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
|
Mon Apr 30 10:16:03 UTC 2012 - cfarrell@suse.com
|
||||||
|
|
||||||
|
@@ -25,6 +25,7 @@ Group: Development/Libraries/Python
|
|||||||
Url: http://pysvn.tigris.org
|
Url: http://pysvn.tigris.org
|
||||||
Source0: http://pysvn.barrys-emacs.org/source_kits/pysvn-%{version}.tar.gz
|
Source0: http://pysvn.barrys-emacs.org/source_kits/pysvn-%{version}.tar.gz
|
||||||
Patch0: bnc445431_pysvn_svnenv.cpp.diff
|
Patch0: bnc445431_pysvn_svnenv.cpp.diff
|
||||||
|
Patch1: bnc780243_fix_build_script.diff
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: libcom_err-devel
|
BuildRequires: libcom_err-devel
|
||||||
@@ -59,6 +60,7 @@ Features:
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n pysvn-%{version}
|
%setup -q -n pysvn-%{version}
|
||||||
%patch0 -p0
|
%patch0 -p0
|
||||||
|
%patch1 -p0
|
||||||
# patch in rpm compiler flags
|
# patch in rpm compiler flags
|
||||||
sed -i 's/CCFLAGS=-Wall/CCFLAGS=$(RPM_OPT_FLAGS) -Wall -Wno-deprecated/g' Source/setup_configure.py
|
sed -i 's/CCFLAGS=-Wall/CCFLAGS=$(RPM_OPT_FLAGS) -Wall -Wno-deprecated/g' Source/setup_configure.py
|
||||||
|
|
||||||
|
@@ -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
|
Mon Apr 30 10:16:03 UTC 2012 - cfarrell@suse.com
|
||||||
|
|
||||||
|
@@ -25,6 +25,7 @@ Group: Development/Libraries/Python
|
|||||||
Url: http://pysvn.tigris.org
|
Url: http://pysvn.tigris.org
|
||||||
Source0: http://pysvn.barrys-emacs.org/source_kits/pysvn-%{version}.tar.gz
|
Source0: http://pysvn.barrys-emacs.org/source_kits/pysvn-%{version}.tar.gz
|
||||||
Patch0: bnc445431_pysvn_svnenv.cpp.diff
|
Patch0: bnc445431_pysvn_svnenv.cpp.diff
|
||||||
|
Patch1: bnc780243_fix_build_script.diff
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: libcom_err-devel
|
BuildRequires: libcom_err-devel
|
||||||
BuildRequires: libexpat-devel
|
BuildRequires: libexpat-devel
|
||||||
@@ -37,13 +38,9 @@ BuildRequires: python3-xml
|
|||||||
BuildRequires: subversion-devel
|
BuildRequires: subversion-devel
|
||||||
BuildRequires: pkgconfig(apr-1)
|
BuildRequires: pkgconfig(apr-1)
|
||||||
Requires: neon
|
Requires: neon
|
||||||
|
Requires: python(abi) = %{py3_ver}
|
||||||
Requires: subversion
|
Requires: subversion
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
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
|
%description
|
||||||
pysvn is a highlevel and easy to use Python bindings to Subversion. The pysvn
|
pysvn is a highlevel and easy to use Python bindings to Subversion. The pysvn
|
||||||
@@ -62,6 +59,7 @@ Features:
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n pysvn-%{version}
|
%setup -q -n pysvn-%{version}
|
||||||
%patch0 -p0
|
%patch0 -p0
|
||||||
|
%patch1 -p0
|
||||||
# patch in rpm compiler flags
|
# patch in rpm compiler flags
|
||||||
sed -i 's/CCFLAGS=-Wall/CCFLAGS=$(RPM_OPT_FLAGS) -Wall -Wno-deprecated/g' Source/setup_configure.py
|
sed -i 's/CCFLAGS=-Wall/CCFLAGS=$(RPM_OPT_FLAGS) -Wall -Wno-deprecated/g' Source/setup_configure.py
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user