rpms/pysvn/F-9 pysvn-1.5.2-drop-version.patch, NONE, 1.1 pysvn-1.5.2-remove-rpath.patch, NONE, 1.1 pysvn-1.5.2-tests-temp_fix.patch, NONE, 1.1 pysvn.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Timothy Selivanow (ravenoak)
fedora-extras-commits at redhat.com
Wed Apr 16 16:34:57 UTC 2008
Author: ravenoak
Update of /cvs/extras/rpms/pysvn/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6964/F-9
Modified Files:
.cvsignore sources
Added Files:
pysvn-1.5.2-drop-version.patch pysvn-1.5.2-remove-rpath.patch
pysvn-1.5.2-tests-temp_fix.patch pysvn.spec
Log Message:
Initial import into F-9
pysvn-1.5.2-drop-version.patch:
--- NEW FILE pysvn-1.5.2-drop-version.patch ---
--- pysvn-1.5.2/Source/pysvn/__init__.py~ 2007-01-04 22:27:40.000000000 +0100
+++ pysvn-1.5.2/Source/pysvn/__init__.py 2008-01-07 12:24:30.000000000 +0100
@@ -88,23 +88,26 @@
SVN_DIRENT_ALL = 0xffffffffl
try:
- maj_min = sys.version_info[:2]
+ # Drop the version trickery below
+ import _pysvn
+
+ #maj_min = sys.version_info[:2]
#
# use an if tree so that its easy for app makers to
# find the import that is requires
#
- if maj_min == (2,3):
- import _pysvn_2_3
- _pysvn = _pysvn_2_3
- elif maj_min == (2,4):
- import _pysvn_2_4
- _pysvn = _pysvn_2_4
- elif maj_min == (2,5):
- import _pysvn_2_5
- _pysvn = _pysvn_2_5
- else:
- raise ImportError( 'Fix pysvn/__init__.py to support python %d.%d' % tuple(maj_min) )
+ #if maj_min == (2,3):
+ # import _pysvn_2_3
+ # _pysvn = _pysvn_2_3
+ #elif maj_min == (2,4):
+ # import _pysvn_2_4
+ # _pysvn = _pysvn_2_4
+ #elif maj_min == (2,5):
+ # import _pysvn_2_5
+ # _pysvn = _pysvn_2_5
+ #else:
+ # raise ImportError( 'Fix pysvn/__init__.py to support python %d.%d' % tuple(maj_min) )
for key, value in _pysvn.__dict__.items():
if not key.startswith( '__' ):
--- pysvn-1.5.2/Source/setup.py.orig 2008-01-11 13:59:59.000000000 -0800
+++ pysvn-1.5.2/Source/setup.py 2008-01-11 14:02:55.000000000 -0800
@@ -163,14 +163,17 @@
# name of the module including the python version to help
# ensure that only a matching _pysvn.so for the version of
# python is imported
- py_cflags_list.append( '-Dinit_pysvn=init_pysvn_%d_%d' % sys.version_info[:2] )
- py_cflags_list.append( '-Dinit_pysvn_d=init_pysvn_%d_%d_d' % sys.version_info[:2] )
+ # Drop this python version trickery
+ #py_cflags_list.append( '-Dinit_pysvn=init_pysvn_%d_%d' % sys.version_info[:2] )
+ #py_cflags_list.append( '-Dinit_pysvn_d=init_pysvn_%d_%d_d' % sys.version_info[:2] )
module_type = '.so'
if sys.platform == 'cygwin':
module_type = '.dll'
template_values = {
- 'pysvn_module_name': '_pysvn_%d_%d%s' % (sys.version_info[0], sys.version_info[1], module_type),
+ # More version "trickery"
+ #'pysvn_module_name': '_pysvn_%d_%d%s' % (sys.version_info[0], sys.version_info[1], module_type),
+ 'pysvn_module_name': '_pysvn%s' % (module_type),
# python executable
'python_exe': sys.executable,
pysvn-1.5.2-remove-rpath.patch:
--- NEW FILE pysvn-1.5.2-remove-rpath.patch ---
--- pysvn-1.5.2/Source/setup.py~ 2008-01-07 10:59:39.000000000 +0100
+++ pysvn-1.5.2/Source/setup.py 2008-01-07 11:00:01.000000000 +0100
@@ -327,7 +327,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 \
pysvn-1.5.2-tests-temp_fix.patch:
--- NEW FILE pysvn-1.5.2-tests-temp_fix.patch ---
--- pysvn-1.5.2/Tests/benchmark_diff.py~ 2006-01-02 08:06:03.000000000 -0800
+++ pysvn-1.5.2/Tests/benchmark_diff.py 2008-02-12 13:24:21.000000000 -0800
@@ -55,7 +55,7 @@
self.python = self.find( 'PYTHON' )
self.username = self.find( 'Username' )
self.username_spaces = self.username
- while len(self.username_spaces) < 10:
+ while len(self.username_spaces) < 15:
self.username_spaces = self.username_spaces + ' '
# ------------------------------------------------------------------------
--- NEW FILE pysvn.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: pysvn
Version: 1.5.3
Release: 1%{dist}
Summary: Pythonic style bindings for Subversion
Group: Development/Languages
License: ASL 1.1
URL: http://pysvn.tigris.org/
Source0: http://pysvn.barrys-emacs.org/source_kits/%{name}-%{version}.tar.gz
Patch0: pysvn-1.5.2-remove-rpath.patch
Patch1: pysvn-1.5.2-drop-version.patch
Patch2: pysvn-1.5.2-tests-temp_fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel
BuildRequires: PyXML
BuildRequires: subversion-devel
BuildRequires: krb5-devel
BuildRequires: neon-devel
BuildRequires: apr-devel
%description
Pythonic style bindings for Subversion
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
%patch1 -p1
# This is a temporary fix. A more elegant solution is needed. I'll have to
# contact upstream to work with them on this...
%patch2 -p1
%build
pushd Source
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py configure --enable-debug --verbose
# Set correct build flags
%{__sed} -i -e 's/-Wall -fPIC -fexceptions -frtti/%{optflags} -fPIC/' Makefile
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
%{__install} -d -m 755 %{buildroot}%{python_sitearch}/%{name}
%{__install} -p -m 644 Source/pysvn/__init__.py %{buildroot}%{python_sitearch}/%{name}
%{__install} -p -m 755 Source/pysvn/_pysvn.so %{buildroot}%{python_sitearch}/%{name}
%check
pushd Tests
%{__make} %{?_smp_mflags}
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root, -)
%doc Docs/pysvn.html Docs/pysvn_prog_guide.html Docs/pysvn_prog_ref.html
%doc Docs/pysvn_prog_ref.js
%doc Examples
%doc LICENSE.txt
%{python_sitearch}/%{name}
%changelog
* Wed Feb 27 2008 Timothy Selivanow <timoth.selivanow at virtualxistenz.com> - 1.5.3-1
- Update to 1.5.3
* Thu Feb 14 2008 Timothy Selivanow <timoth.selivanow at virtualxistenz.com> - 1.5.2-6
- Clean up. Name change (back to upstream)
* Tue Feb 12 2008 Timothy Selivanow <timoth.selivanow at virtualxistenz.com> - 1.5.2-5
- Temporary fix for tests. Need to work with upstream for permanent fix.
* Fri Feb 08 2008 Timothy Selivanow <timothy.selivanow at virtualxistenz.com> - 1.5.2-4
- Fixed build requires, libgssapi-devel was still in there (for EL5 support)
* Fri Jan 11 2008 Timothy Selivanow <timothy.selivanow at virtualxistenz.com> - 1.5.2-3
- Merged patches and spec changes by Terje Røsten <terje.rosten at ntnu.no>
- Fixed the test failures
* Fri Jan 04 2008 Timothy Selivanow <timothy.selivanow at virtualxistenz.com> - 1.5.2-2
- Attempting to make the spec work with different versions of Python
* Mon Sep 03 2007 Timothy Selivanow <timothy.selivanow at virtualxistenz.com> - 1.5.2-1
- Update to 1.5.2
- Some spec clean up
* Fri Jan 12 2007 Timothy Selivanow <timothy.selivanow at virtualxistenz.com> - 1.5.0-1
- Initial spec creation
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pysvn/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 16 Apr 2008 01:39:09 -0000 1.1
+++ .cvsignore 16 Apr 2008 16:34:21 -0000 1.2
@@ -0,0 +1 @@
+pysvn-1.5.3.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pysvn/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 16 Apr 2008 01:39:09 -0000 1.1
+++ sources 16 Apr 2008 16:34:21 -0000 1.2
@@ -0,0 +1 @@
+68ee1b4cbeb4126c12896793d78a07fb pysvn-1.5.3.tar.gz
More information about the fedora-extras-commits
mailing list