From f1985a504cb944bc4d0fca68a8634622e6c93de2 Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@fedoraproject.org>
Date: Thu, 7 Dec 2006 16:23:08 +0000
Subject: [PATCH] - rebuild against python 2.5 - follow python packaging
 guidelines

---
 subversion.spec | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/subversion.spec b/subversion.spec
index 83ff3fa..3d26b5d 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -10,10 +10,12 @@
 
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
 Version: 1.4.2
-Release: 3
+Release: 4
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -34,8 +36,7 @@ BuildRoot: %{_tmppath}/%{name}-root
 %define __perl_requires %{SOURCE3}
 
 # Put Python bindings in site-packages
-%define pydir %(python -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')
-%define swigdirs swig_pydir=%{pydir}/libsvn swig_pydir_extra=%{pydir}/svn
+%define swigdirs swig_pydir=%{pyton_sitearch}/libsvn swig_pydir_extra=%{python_sitearch}/svn
 
 %description
 Subversion is a concurrent version control system which enables one
@@ -149,7 +150,7 @@ install -m 644 $RPM_SOURCE_DIR/subversion.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/h
 
 # Remove unpackaged files
 rm -rf ${RPM_BUILD_ROOT}%{_includedir}/subversion-*/*.txt \
-       ${RPM_BUILD_ROOT}%{pydir}/*/*.{a,la}
+       ${RPM_BUILD_ROOT}%{python_sitearch}/*/*.{a,la}
 
 # remove stuff produced with Perl modules
 find $RPM_BUILD_ROOT -type f \
@@ -206,8 +207,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/*
 %{_libdir}/libsvn_*.so.*
 %{_mandir}/man*/*
-%{pydir}/svn
-%{pydir}/libsvn
+%{python_sitearch}/svn
+%{python_sitearch}/libsvn
 %{_datadir}/emacs/site-lisp
 %{_datadir}/xemacs/site-packages/lisp
 %dir %{_sysconfdir}/subversion
@@ -251,6 +252,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Thu Dec  7 2006 Jeremy Katz <katzj@redhat.com> - 1.4.2-4
+- rebuild against python 2.5
+- follow python packaging guidelines
+
 * Wed Nov  8 2006 Joe Orton <jorton@redhat.com> 1.4.2-3
 - update to 1.4.2