From 656221bf35180744509e5f121f092b18a923e5c3 Mon Sep 17 00:00:00 2001 From: Caitlyn O'Hanna Date: Mar 06 2009 05:35:33 +0000 Subject: Update to 1.6.3 --- diff --git a/pysvn-1.6.2-fix-benchmark.patch b/pysvn-1.6.2-fix-benchmark.patch deleted file mode 100644 index e70d535..0000000 --- a/pysvn-1.6.2-fix-benchmark.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- Tests/benchmark_diff.py (revision 1071) -+++ Tests/benchmark_diff.py (working copy) -@@ -54,9 +54,6 @@ - self.workdir = self.find( 'WorkDir' ) - self.python = self.find( 'PYTHON' ) - self.username = self.find( 'Username' ) -- self.username_spaces = self.username -- while len(self.username_spaces) < 10: -- self.username_spaces = self.username_spaces + ' ' - - # ------------------------------------------------------------------------ - # Version strings: -@@ -105,9 +102,9 @@ - - if True: - # must replace username after workdir -- username_spaces_re = re.compile( r'\b'+self.username_spaces ) -+ username_spaces_re = re.compile( r'\b'+self.username+' * ' ) - self.replacement_list.append( -- (username_spaces_re, '') ) -+ (username_spaces_re, ' ') ) - - username_re = re.compile( r': %s\b' % self.username ) - self.replacement_list.append( (username_re, ': ') ) - diff --git a/pysvn.spec b/pysvn.spec index dba0a78..40b600f 100644 --- a/pysvn.spec +++ b/pysvn.spec @@ -1,14 +1,13 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: pysvn -Version: 1.6.2 +Version: 1.6.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.6.2-fix-benchmark.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel BuildRequires: PyXML @@ -23,10 +22,10 @@ Pythonic style bindings for Subversion %prep %setup -q -n %{name}-%{version} -%patch0 %build pushd Source +%{__python} setup.py backport CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py configure --enable-debug --verbose --norpath --fixed-module-name # Set correct build flags %{__sed} -i -e 's/-Wall -fPIC -fexceptions -frtti/%{optflags} -fPIC -frtti/' Makefile @@ -54,6 +53,9 @@ pushd Tests %{python_sitearch}/%{name} %changelog +* Thu Mar 05 2009 Caitlyn O'Hanna - 1.6.3-1 +- Update to 1.6.3, removed benchmark patch + * Tue Oct 28 2008 Caitlyn O'Hanna - 1.6.2-1 - Upstream to 1.6.2, upstream provided some build fixes to remove patches - (Thanks Barry!). Re-enabled testing with provided patch to fix whitespace diff --git a/sources b/sources index dc64be8..b04a022 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58bb216b815f3c05ed77f70708515355 pysvn-1.6.2.tar.gz +41d312ff09b05f7b53d3641a82c64c93 pysvn-1.6.3.tar.gz