From 543e1ac558f1044666d5e5949636f3ce1dd6f7350d7853a22eb6651ab9495737 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Thu, 22 Nov 2012 12:06:17 +0000 Subject: [PATCH 1/2] Accepting request 142368 from home:robert_munteanu:branches:devel:languages:python Added patch for bnc#780243, cherry-picked from upstream r1742 OBS-URL: https://build.opensuse.org/request/show/142368 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pysvn?expand=0&rev=25 --- bnc780243_fix_build_script.diff | 22 ++++++++++++++++++++++ python-pysvn.changes | 5 +++++ python-pysvn.spec | 2 ++ python3-pysvn.changes | 5 +++++ python3-pysvn.spec | 2 ++ 5 files changed, 36 insertions(+) create mode 100644 bnc780243_fix_build_script.diff diff --git a/bnc780243_fix_build_script.diff b/bnc780243_fix_build_script.diff new file mode 100644 index 0000000..e56e0ac --- /dev/null +++ b/bnc780243_fix_build_script.diff @@ -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): diff --git a/python-pysvn.changes b/python-pysvn.changes index 0a90029..ee1d160 100644 --- a/python-pysvn.changes +++ b/python-pysvn.changes @@ -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 diff --git a/python-pysvn.spec b/python-pysvn.spec index 7e6c1d1..5442bc4 100644 --- a/python-pysvn.spec +++ b/python-pysvn.spec @@ -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 diff --git a/python3-pysvn.changes b/python3-pysvn.changes index 56c5f7f..4104a6b 100644 --- a/python3-pysvn.changes +++ b/python3-pysvn.changes @@ -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 diff --git a/python3-pysvn.spec b/python3-pysvn.spec index bb8cb84..7be4692 100644 --- a/python3-pysvn.spec +++ b/python3-pysvn.spec @@ -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 @@ -62,6 +63,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 From f462592c3c5233d93307322e173b67f38f3ba47a20a190c6e99186d7ad337d19 Mon Sep 17 00:00:00 2001 From: Todd R Date: Sun, 25 Nov 2012 11:27:57 +0000 Subject: [PATCH 2/2] Accepting request 142817 from devel:languages:python3 Removed openSUSE 11.4 spec file workarounds (forwarded request 142816 from TheBlackCat) OBS-URL: https://build.opensuse.org/request/show/142817 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pysvn?expand=0&rev=26 --- python3-pysvn.changes | 5 +++++ python3-pysvn.spec | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/python3-pysvn.changes b/python3-pysvn.changes index 4104a6b..6ccf3e8 100644 --- a/python3-pysvn.changes +++ b/python3-pysvn.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/python3-pysvn.spec b/python3-pysvn.spec index 7be4692..6729c36 100644 --- a/python3-pysvn.spec +++ b/python3-pysvn.spec @@ -38,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