From 1adb43ce4d2fcc180aee0b3ebedfaaaba22cc8204861b08179bba0107b22234e Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Thu, 1 Aug 2013 12:16:06 +0000 Subject: [PATCH] Accepting request 185428 from home:frispete:python How about this: - update to 1.7.7 * no degestible changelog provided from upstream OBS-URL: https://build.opensuse.org/request/show/185428 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pysvn?expand=0&rev=30 --- bnc780243_fix_build_script.diff | 22 ---------------------- pysvn-1.7.6.tar.gz | 3 --- pysvn-1.7.7.tar.gz | 3 +++ python-pysvn.changes | 6 ++++++ python-pysvn.spec | 17 ++++++++--------- 5 files changed, 17 insertions(+), 34 deletions(-) delete mode 100644 bnc780243_fix_build_script.diff delete mode 100644 pysvn-1.7.6.tar.gz create mode 100644 pysvn-1.7.7.tar.gz diff --git a/bnc780243_fix_build_script.diff b/bnc780243_fix_build_script.diff deleted file mode 100644 index e56e0ac..0000000 --- a/bnc780243_fix_build_script.diff +++ /dev/null @@ -1,22 +0,0 @@ -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/pysvn-1.7.6.tar.gz b/pysvn-1.7.6.tar.gz deleted file mode 100644 index f18edb8..0000000 --- a/pysvn-1.7.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47252408a1b18add18634395108737eaca77d12fbb22e5f187280b9e074c8b73 -size 331549 diff --git a/pysvn-1.7.7.tar.gz b/pysvn-1.7.7.tar.gz new file mode 100644 index 0000000..c12ca62 --- /dev/null +++ b/pysvn-1.7.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f088e57df77c3779fc0060dab6d65b8f965a098beeaee91e45eb6b54c4d92cb +size 331956 diff --git a/python-pysvn.changes b/python-pysvn.changes index ee1d160..76fbe23 100644 --- a/python-pysvn.changes +++ b/python-pysvn.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 31 15:10:02 UTC 2013 - hpj@urpla.net + +- update to 1.7.7 + * no degestible changelog provided from upstream + ------------------------------------------------------------------- Thu Nov 22 11:17:40 UTC 2012 - robert.munteanu@gmail.com diff --git a/python-pysvn.spec b/python-pysvn.spec index 25c0692..73f5e72 100644 --- a/python-pysvn.spec +++ b/python-pysvn.spec @@ -17,7 +17,7 @@ Name: python-pysvn -Version: 1.7.6 +Version: 1.7.7 Release: 0 Summary: Highlevel Subversion Python Bindings License: Apache-1.1 @@ -25,9 +25,9 @@ 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: libapr1-devel BuildRequires: libcom_err-devel BuildRequires: libcom_err2 BuildRequires: libexpat-devel @@ -35,7 +35,6 @@ BuildRequires: neon-devel BuildRequires: python-devel BuildRequires: python-xml BuildRequires: subversion-devel -BuildRequires: pkgconfig(apr-1) Requires: neon Requires: subversion BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -60,15 +59,13 @@ 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 %build cd Source python setup.py backport -python setup.py configure -# --norpath +python setup.py configure --enable-debug --norpath make %{?_smp_mflags} %install @@ -77,9 +74,11 @@ cp Source/pysvn/{__init__.py,_pysvn*.so} %{buildroot}/%{python_sitearch}/pysvn %py_compile %{buildroot}/%{python_sitearch}/pysvn rm -f Docs/generate_cpp_docs_from_html_docs.py -#%%check -#cd Tests -#make %{?_smp_mflags} +#some of these tests (test-01.unix) are way too fragile to operate properly +#over a certain amount of different svn versions, as the compare output strings +%check +cd Tests +make %{?_smp_mflags} || true %files %defattr(-,root,root)