rpms/pysvn/F-8 pysvn-1.5.3-remove-rpath.patch, NONE, 1.1 pysvn-1.6.1-drop-version.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pysvn.spec, 1.1, 1.2 sources, 1.2, 1.3
Caitlyn O'Hanna
ravenoak at fedoraproject.org
Fri Oct 10 18:11:22 UTC 2008
Author: ravenoak
Update of /cvs/pkgs/rpms/pysvn/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23476
Modified Files:
.cvsignore pysvn.spec sources
Added Files:
pysvn-1.5.3-remove-rpath.patch pysvn-1.6.1-drop-version.patch
Log Message:
Update F-8 to 1.6.1
pysvn-1.5.3-remove-rpath.patch:
--- NEW FILE pysvn-1.5.3-remove-rpath.patch ---
--- Source/setup.py.orig 2008-09-24 15:02:33.000000000 -0700
+++ Source/setup.py 2008-09-24 15:03:47.000000000 -0700
@@ -336,7 +336,7 @@
PYCXX=%(pycxx_dir)s
PYCXXSRC=%(pycxx_src_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.6.1-drop-version.patch:
--- NEW FILE pysvn-1.6.1-drop-version.patch ---
--- Source/setup.py.orig 2008-10-01 16:34:29.000000000 -0700
+++ Source/setup.py 2008-10-01 16:33:38.000000000 -0700
@@ -167,14 +167,18 @@
# 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] )
+
+ # Packager edit: We don't need this in Fedora, only one system python installed
+ #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),
+ 'pysvn_module_name': '_pysvn%s' % (module_type),
+ # Packager edit: We don't need this in Fedora, only one system python installed
+ #'pysvn_module_name': '_pysvn_%d_%d%s' % (sys.version_info[0], sys.version_info[1], module_type),
# python executable
'python_exe': sys.executable,
--- Source/pysvn/__init__.py.template.orig 2008-09-10 11:45:44.000000000 -0700
+++ Source/pysvn/__init__.py.template 2008-10-01 16:37:49.000000000 -0700
@@ -88,40 +88,42 @@
SVN_DIRENT_ALL = 0xffffffffl
try:
- maj_min = sys.version_info[:2]
-
+ # Packager edit: We don't need this in Fedora, only one system python installed
+ #maj_min = sys.version_info[:2]
+ import _pysvn
+
### IMPORT BLOCK BEGIN
#
# 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
-
- elif maj_min == (2,6):
- import _pysvn_2_6
- _pysvn = _pysvn_2_6
-
- elif maj_min == (2,7):
- import _pysvn_2_7
- _pysvn = _pysvn_2_7
-
- elif maj_min == (3,0):
- import _pysvn_3_0
- _pysvn = _pysvn_3_0
-
- elif maj_min == (3,1):
- import _pysvn_3_1
- _pysvn = _pysvn_3_1
+ #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
+
+ #elif maj_min == (2,6):
+ # import _pysvn_2_6
+ # _pysvn = _pysvn_2_6
+
+ #elif maj_min == (2,7):
+ # import _pysvn_2_7
+ # _pysvn = _pysvn_2_7
+
+ #elif maj_min == (3,0):
+ # import _pysvn_3_0
+ # _pysvn = _pysvn_3_0
+
+ #elif maj_min == (3,1):
+ # import _pysvn_3_1
+ # _pysvn = _pysvn_3_1
else:
raise ImportError( 'Fix pysvn/__init__.py to support python %d.%d' % tuple(maj_min) )
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pysvn/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 16 Apr 2008 15:55:26 -0000 1.2
+++ .cvsignore 10 Oct 2008 18:10:52 -0000 1.3
@@ -1 +1 @@
-pysvn-1.5.3.tar.gz
+pysvn-1.6.1.tar.gz
Index: pysvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pysvn/F-8/pysvn.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pysvn.spec 16 Apr 2008 15:55:26 -0000 1.1
+++ pysvn.spec 10 Oct 2008 18:10:52 -0000 1.2
@@ -1,15 +1,15 @@
%{!?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
+Version: 1.6.1
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
+Patch0: pysvn-1.5.3-remove-rpath.patch
+Patch1: pysvn-1.6.1-drop-version.patch
Patch2: pysvn-1.5.2-tests-temp_fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel
@@ -18,17 +18,17 @@
BuildRequires: krb5-devel
BuildRequires: neon-devel
BuildRequires: apr-devel
+BuildRequires: openssl-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
+%patch0
+%patch1
+# Broken for F10, possibly because of subversion 1.5
+#%patch2 -p1
%build
pushd Source
@@ -43,9 +43,9 @@
%{__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}
+#%check
+#pushd Tests
+#%{__make} %{?_smp_mflags}
%clean
%{__rm} -rf %{buildroot}
@@ -59,13 +59,17 @@
%{python_sitearch}/%{name}
%changelog
-* Wed Feb 27 2008 Timothy Selivanow <timoth.selivanow at virtualxistenz.com> - 1.5.3-1
+* Mon Oct 06 2008 Caitlyn O'Hanna <ravenoak at virtualxistenz.com> - 1.6.1-1
+- Update to 1.6.1, fix F10 FBFS
+- Disabled tests, might be because of subversion 1.5
+
+* Wed Feb 27 2008 Timothy Selivanow <timothy.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
+* Thu Feb 14 2008 Timothy Selivanow <timothy.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
+* Tue Feb 12 2008 Timothy Selivanow <timothy.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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pysvn/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 16 Apr 2008 15:55:26 -0000 1.2
+++ sources 10 Oct 2008 18:10:52 -0000 1.3
@@ -1 +1 @@
-68ee1b4cbeb4126c12896793d78a07fb pysvn-1.5.3.tar.gz
+7beed40705669fdc802c07b011b61730 pysvn-1.6.1.tar.gz
More information about the fedora-extras-commits
mailing list