From 1ad5c3c66de7f866287e8dd68540432506e2ec027139596174ea22b9a96d42c0 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 10 Sep 2009 11:13:28 +0000 Subject: [PATCH] Accepting request 20301 from devel:languages:python Copy from devel:languages:python/python-pysvn based on submit request 20301 from user dirkmueller OBS-URL: https://build.opensuse.org/request/show/20301 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pysvn?expand=0&rev=4 --- MANIFEST.in | 13 ------- pysvn-1.6.0.tar.bz2 | 3 -- pysvn-1.7.0.tar.bz2 | 3 ++ pysvn-no_rpath.diff | 20 ----------- pysvn-optflags.diff | 38 -------------------- python-pysvn.changes | 6 ++++ python-pysvn.spec | 82 +++++++++++++++++--------------------------- setup.py | 64 ---------------------------------- 8 files changed, 41 insertions(+), 188 deletions(-) delete mode 100644 MANIFEST.in delete mode 100644 pysvn-1.6.0.tar.bz2 create mode 100644 pysvn-1.7.0.tar.bz2 delete mode 100644 pysvn-no_rpath.diff delete mode 100644 pysvn-optflags.diff delete mode 100644 setup.py diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index 78139ff..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1,13 +0,0 @@ -include setup.py -include *.txt *.html -graft Builder -graft Docs -graft Examples -graft Import -graft Kit -graft Patches -graft Source -graft Tests -global-exclude *.o -prune Source/pysvn -include MANIFEST.in diff --git a/pysvn-1.6.0.tar.bz2 b/pysvn-1.6.0.tar.bz2 deleted file mode 100644 index d2b556a..0000000 --- a/pysvn-1.6.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06172e74163765a9709d4f6ec49b48606d9fa64c24540457c7bf63ee9bdb2e0d -size 171140 diff --git a/pysvn-1.7.0.tar.bz2 b/pysvn-1.7.0.tar.bz2 new file mode 100644 index 0000000..a0293de --- /dev/null +++ b/pysvn-1.7.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5669e7072cecd2c1ed6a8948f9014def8d143d9bd0dc838320d1196d3a4a5766 +size 239878 diff --git a/pysvn-no_rpath.diff b/pysvn-no_rpath.diff deleted file mode 100644 index 48e88c4..0000000 --- a/pysvn-no_rpath.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- Source/setup.py 2007-01-16 23:34:06.000000000 +0100 -+++ Source/setup.py.oden 2007-03-01 11:32:04.000000000 +0100 -@@ -275,7 +275,7 @@ - CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s - PYCXX=%(pycxx_dir)s - LDSHARED=g++ -shared %(debug_cflags)s --LDLIBS=-L%(svn_lib_dir)s -Wl,--rpath -Wl,%(svn_lib_dir)s \ -+LDLIBS=-L%(svn_lib_dir)s \ - -lsvn_client-1 \ - -lsvn_diff-1 \ - -lsvn_repos-1 \ -@@ -296,7 +296,7 @@ - CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s - PYCXX=%(pycxx_dir)s - LDSHARED=g++ -shared %(debug_cflags)s --LDLIBS=-L%(svn_lib_dir)s -Wl,--rpath -Wl,%(svn_lib_dir)s \ -+LDLIBS=-L%(svn_lib_dir)s \ - -lsvn_client-1 \ - -lsvn_diff-1 \ - -lsvn_repos-1 \ diff --git a/pysvn-optflags.diff b/pysvn-optflags.diff deleted file mode 100644 index 16e62a1..0000000 --- a/pysvn-optflags.diff +++ /dev/null @@ -1,38 +0,0 @@ ---- Source/setup.py 2007-03-01 11:33:22.000000000 +0100 -+++ Source/setup.py.oden 2007-03-01 11:35:57.000000000 +0100 -@@ -270,9 +270,9 @@ - PYTHON=%(python_exe)s - SVN_INCLUDE=%(svn_include)s - CCC=g++ -c --CCCFLAGS=-Wall -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s %(debug_cflags)s -+CCCFLAGS=$(RPM_OPT_FLAGS) -Wall -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s %(debug_cflags)s - CC=gcc -c --CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s -+CCFLAGS=$(RPM_OPT_FLAGS) -Wall -fPIC %(includes)s %(debug_cflags)s - PYCXX=%(pycxx_dir)s - LDSHARED=g++ -shared %(debug_cflags)s - LDLIBS=-L%(svn_lib_dir)s \ -@@ -291,9 +291,9 @@ - PYTHON=%(python_exe)s - SVN_INCLUDE=%(svn_include)s - CCC=g++ -c --CCCFLAGS=-Wall -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s %(debug_cflags)s -+CCCFLAGS=$(RPM_OPT_FLAGS) -Wall -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s %(debug_cflags)s - CC=gcc -c --CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s -+CCFLAGS=$(RPM_OPT_FLAGS) -Wall -fPIC %(includes)s %(debug_cflags)s - PYCXX=%(pycxx_dir)s - LDSHARED=g++ -shared %(debug_cflags)s - LDLIBS=-L%(svn_lib_dir)s \ -@@ -312,9 +312,9 @@ - PYTHON=%(python_exe)s - SVN_INCLUDE=%(svn_include)s - CCC=g++ -c --CCCFLAGS=-Wall -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s %(debug_cflags)s -+CCCFLAGS=$(RPM_OPT_FLAGS) -Wall -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s %(debug_cflags)s - CC=gcc -c --CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s -+CCFLAGS=$(RPM_OPT_FLAGS) -Wall -fPIC %(includes)s %(debug_cflags)s - PYCXX=%(pycxx_dir)s - LDSHARED=g++ -shared %(debug_cflags)s - LDLIBS=-L%(svn_lib_dir)s \ diff --git a/python-pysvn.changes b/python-pysvn.changes index 760b0b7..d178c96 100644 --- a/python-pysvn.changes +++ b/python-pysvn.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Aug 8 15:27:59 CEST 2009 - hpj@urpla.net + +- update to version 1.7.0 + switch to the authors recommended way to build/install this thing + ------------------------------------------------------------------- Sun Nov 23 08:01:25 CET 2008 - coolo@suse.de diff --git a/python-pysvn.spec b/python-pysvn.spec index cc4c17f..231503f 100644 --- a/python-pysvn.spec +++ b/python-pysvn.spec @@ -1,7 +1,7 @@ # -# spec file for package python-pysvn (Version 1.6.0) +# spec file for package python-pysvn (Version 1.7.0) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,26 +22,27 @@ Name: python-pysvn Group: Development/Libraries/Python Url: http://pysvn.tigris.org -License: The Apache Software License +License: Apache Software License .. BuildRequires: gcc gcc-c++ libapr1-devel libcom_err-devel libcom_err2 libexpat-devel neon-devel python python-devel python-xml subversion-devel -Requires: libapr1 neon subversion libcom_err2 -Version: 1.6.0 -Release: 5 +Requires: neon subversion +Version: 1.7.0 +Release: 1 Source0: %{_realname}-%{version}.tar.bz2 -Source1: setup.py -Source2: MANIFEST.in -Patch0: pysvn-no_rpath.diff -Patch1: pysvn-optflags.diff -Patch2: bnc445431_pysvn_svnenv.cpp.diff +Patch0: bnc445431_pysvn_svnenv.cpp.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Highlevel Subversion Python Bindings +%if 0%suse_version <= 1110 +%define _sitedir %py_sitedir/%_realname +%else +%define _sitedir %python_sitearch/%_realname +%endif %description pysvn is a highlevel and easy to use Python bindings to Subversion. - The pysvn project's goal is to enable Tools to be written in - Python that use Subversion. Windows, Mac OS X, Linux and other - unix platforms are supported. Features: * Supports all svn client - features +The pysvn project's goal is to enable Tools to be written in Python +that use Subversion. Windows, Mac OS X, Linux and other unix +platforms are supported. Features: * Supports all svn client +features * Supports svn transaction features required to write svn pre-commit hooks @@ -63,51 +64,32 @@ Authors: %prep %setup -q -n %{_realname}-%{version} %patch0 -p0 -%patch1 -p0 -%patch2 -p0 -cp %{S:1} . -cp %{S:2} . +# patch in rpm compiler flags +sed -i 's/CCFLAGS=-Wall/CCFLAGS=$(RPM_OPT_FLAGS) -Wall -Wno-deprecated/g' Source/setup_configure.py %build -python setup.py build +cd Source +python setup.py backport +python setup.py configure --norpath +make +#cd ../Tests +#make %install -python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --record-rpm=INSTALLED_FILES -grep -v "share.doc.packages" INSTALLED_FILES > INSTALLED_FILES.new -mv INSTALLED_FILES.new INSTALLED_FILES +mkdir -p $RPM_BUILD_ROOT/%_sitedir +cp Source/pysvn/__init__.py $RPM_BUILD_ROOT/%_sitedir +cp Source/pysvn/_pysvn*.so $RPM_BUILD_ROOT/%_sitedir +%py_compile $RPM_BUILD_ROOT/%_sitedir +rm -f Docs/generate_cpp_docs_from_html_docs.py %clean rm -rf $RPM_BUILD_ROOT -%files -f INSTALLED_FILES +%files %defattr(-,root,root) %doc LICENSE.txt -%doc Docs/* +%doc Docs %doc Examples +%_sitedir %changelog -* Sun Nov 23 2008 coolo@suse.de -- readd the second last change -* Tue Nov 18 2008 toms@suse.de -- Fixed bnc#445431 "undefinied C++ code" - in pysvn_svnenv.cpp -* Wed Oct 29 2008 ro@suse.de -- fix typo in specfile -- remove doc files from INSTALLED_FILES -* Wed Oct 22 2008 toms@suse.de -- renamed macro _realname -* Thu Sep 25 2008 toms@suse.de -- Taken from home:/termim into factory -* Thu Aug 07 2008 Mikhail Terekhov -- Version 1.6.0 setup.py -* Wed Feb 28 2007 Jérôme Soyer -- Revision: 130370 -- New release - Bogdano Arendartchuk - - fix after version upgrade) -* Tue Dec 05 2006 Jérôme Soyer -- Revision: 91597 -- Remove patch and update -- Rebuild for latest pyhton - + Bogdano Arendartchuk - - Import python-pysvn diff --git a/setup.py b/setup.py deleted file mode 100644 index a4f03c6..0000000 --- a/setup.py +++ /dev/null @@ -1,64 +0,0 @@ -""" - This wrapper makes pysvn build/install process distutils compatible. - Mikhail Terekhov -""" - -from distutils.command.build_ext import build_ext as _build_ext -from distutils.core import setup, Extension -import sys, os, os.path, subprocess - -class build_ext(_build_ext): - def build_extension(self, ext): - sources = ext.sources[0] - fullname = self.get_ext_fullname(ext.name) - modpath = fullname.split('.') - package = '.'.join(modpath[:-1]) - base = modpath[-1] - build_py = self.get_finalized_command('build_py') - package_dir = build_py.get_package_dir(package) - ext_filename = os.path.join(package_dir, self.get_ext_filename(base)) - outfile = os.path.join(self.build_lib, *modpath[:-1]) - outfile = os.path.join(outfile,self.get_ext_filename(base)) - sys.path.insert(0,sources) - import setup as msetup - curdir = os.path.abspath(os.curdir) - try: - os.chdir(sources) - msetup.main(['','configure']) - subprocess.call('make') - finally: - os.chdir(curdir) - - self.copy_file(ext_filename, outfile, preserve_mode=True) - -docs = [os.path.join('Docs',x) for x in os.listdir('Docs')] -examples = [os.path.join('Examples/Client',x) for x in os.listdir('Examples/Client')] - -setup(name='pysvn', - version='1.0', - url = 'http://pysvn.tigris.org/', - author = 'Barry Scott', - author_email = 'barryscott@tigris.org', - description = "Highlevel and easy to use Python bindings to Subversion", - long_description = - "The pysvn project's goal is to enable Tools to be written in Python that use Subversion. " - "Windows, Mac OS X, Linux and other unix platforms are supported.", - - cmdclass={'build_ext': build_ext}, - packages = ['pysvn'], - package_dir = {'pysvn': 'Source/pysvn'}, - data_files = [('share/doc/packages/python-pysvn', docs), - ('share/doc/packages/python-pysvn/Examples/Client', examples)], - ext_modules=[Extension('pysvn._pysvn_%d_%d' % sys.version_info[:2], ['Source']),], - - classifiers=[ - 'License :: Apache License', - 'Development Status :: 5 - Production/Stable', - 'Programming Language :: Python', - 'Intended Audience :: Developers', - 'Operating System :: MacOS :: MacOS X', - 'Operating System :: Microsoft :: Windows', - 'Operating System :: POSIX', - 'Topic :: Software Development :: Version Control', - ], - )