Hello community, here is the log from the commit of package python-pysvn for openSUSE:Factory checked in at 2012-11-28 14:34:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pysvn (Old) and /work/SRC/openSUSE:Factory/.python-pysvn.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pysvn", Maintainer is "thomas.schrai...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/python-pysvn/python-pysvn.changes 2012-05-07 22:50:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-pysvn.new/python-pysvn.changes 2012-11-28 14:34:35.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 22 11:17:40 UTC 2012 - robert.munte...@gmail.com + +- Added patch for bnc#780243, cherry-picked from upstream r1742 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python-pysvn/python3-pysvn.changes 2012-05-07 22:50:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-pysvn.new/python3-pysvn.changes 2012-11-28 14:34:35.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Nov 22 14:28:33 UTC 2012 - toddrme2...@gmail.com + +- Removed openSUSE 11.4 spec file workarounds + +------------------------------------------------------------------- +Thu Nov 22 11:17:40 UTC 2012 - robert.munte...@gmail.com + +- Added patch for bnc#780243, cherry-picked from upstream r1742 + +------------------------------------------------------------------- New: ---- bnc780243_fix_build_script.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pysvn.spec ++++++ --- /var/tmp/diff_new_pack.c4TjC9/_old 2012-11-28 14:34:36.000000000 +0100 +++ /var/tmp/diff_new_pack.c4TjC9/_new 2012-11-28 14:34:36.000000000 +0100 @@ -25,6 +25,7 @@ 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 @@ %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 ++++++ python3-pysvn.spec ++++++ --- /var/tmp/diff_new_pack.c4TjC9/_old 2012-11-28 14:34:36.000000000 +0100 +++ /var/tmp/diff_new_pack.c4TjC9/_new 2012-11-28 14:34:36.000000000 +0100 @@ -25,6 +25,7 @@ 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: 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 @@ %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 ++++++ bnc780243_fix_build_script.diff ++++++ 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): -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
