- new subpackages: libs and python; release 3

Changed files:
    subversion.spec -> 1.9

diff --git a/subversion.spec b/subversion.spec
index d18557fabf172c0c5343c3e7f48b9ef6302a254d..28a6dbc18960473545152af946648fba190f21d9 100644 (file)
--- a/subversion.spec
+++ b/subversion.spec
@@ -1,17 +1,18 @@
 # TODO:
 # - move modules to some directory (+ link with rpath)
-# - python bindings subpackage
+%include        /usr/lib/rpm/macros.python
 Summary:       A Concurrent Versioning system similar to but better than CVS.
 Summary(pl):   System Concurrent Versioning System ale lepszy ni¿ CVS
 Name:          subversion
 Version:       1587
-Release:       2
+Release:       3
 License:       Apache/BSD Style
 Group:         Development/Version Control
 Source0:       http://subversion.tigris.org/%{name}-r%{version}.tar.gz
 Source1:       %{name}-dav_svn.conf
 Patch0:                %{name}-lib.patch
 Patch1:                %{name}-apache2.patch
+Patch2:                %{name}-python.patch
 URL:           http://subversion.tigris.org/
 BuildRequires: apache-devel >= 2.0.35
 BuildRequires: apr-devel >= 2.0.35
@@ -19,17 +20,18 @@ BuildRequires:      autoconf >= 2.53
 BuildRequires: bison
 BuildRequires: db4-devel >= 4.0.14
 BuildRequires: expat-devel
-BuildRequires: libtool >= 1.4
+BuildRequires: libtool >= 1.4-9
 BuildRequires: neon-devel >= 0.19.2
 BuildRequires: python >= 2.2
+BuildRequires: rpm-pythonprov >= 4.0.2-50
+BuildRequires: swig >= 1.3.11
 BuildRequires: texinfo
 Requires(post):        /usr/sbin/fix-info-dir
-Requires(post):        /sbin/ldconfig
-Requires(postun): /sbin/ldconfig 
-Requires(postun): /usr/sbin/fix-info-dir 
+Requires(postun):      /usr/sbin/fix-info-dir
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _libexecdir     /usr/lib/apache
+%define                _apachelibdir   /usr/lib/apache
+%define                _libexecdir     %{_libdir}/svn
 
 %description
 The goal of the Subversion project is to build a version control
@@ -68,11 +70,22 @@ Cele projektu to:
 - Internacjonalizacja.
 - Postêpuj±ce wsparcie dla wielu jêzyków.
 
+%package libs
+Summary:       Subversion libraries and modules
+Summary(pl):   Biblioteka subversion oraz ³adowalne modu³y
+Group:         Libraries
+
+%description libs
+Subversion libraries and modules.
+
+%description libs -l pl
+Biblioteka subversion oraz ³adowalne modu³y.
+
 %package devel
 Summary:       Header files and develpment documentation for subversion
 Summary(pl):   Pliki nag³ówkowe i dokumetacja do subversion
 Group:         Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name}-libs = %{version}
 
 %description devel
 Header files and develpment documentation for subversion.
@@ -92,6 +105,19 @@ Static subversion library.
 %description static -l pl
 Biblioteka statyczna subversion.
 
+%package python
+Summary:       Subversion python bindings
+Summary(pl):   Dowi±zania do subversion dla pythona
+Group:         Development/Languages/Python
+Requires:      python >= 2.2
+%pyrequires_eq python
+
+%description python
+Subversion python bindings.
+
+%description python -l pl
+Dowi±zania do subversion dla pythona.
+
 %package -n apache-mod_dav_svn
 Summary:       Apache module: Subversion Server
 Summary(pl):   Modu³ apache: Serwer Subversion
@@ -109,6 +135,7 @@ Modu
 %setup -q -n %{name}-r%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 ./autogen.sh
@@ -123,13 +150,13 @@ rm -rf expat-lite/xmlrole* expat-lite/xmltok* neon apr
        --with-berkeley-db=%{_includedir}/db4:%{_libdir}
 %{__make}
 
+cd subversion/bindings/swig/python
+CFLAGS="%{rpmcflags}" python setup.py build
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/httpd/httpd.conf,%{_libexecdir}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/httpd/httpd.conf,%{_apachelibdir}}
 
-# relinking sux
-for i in 1 2; do
-[ "$i" = "2" ] && find . -name "*.la" -exec rm -f "{}" ";"
 %{__make} install \
        INSTALL_MOD_SHARED=echo \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -140,21 +167,27 @@ for i in 1 2; do
        bindir=$RPM_BUILD_ROOT%{_bindir} \
        fs_bindir=$RPM_BUILD_ROOT%{_bindir} \
        includedir=$RPM_BUILD_ROOT%{_includedir}/%{name}
-done
 
-install subversion/mod_dav_svn/.libs/*.so $RPM_BUILD_ROOT%{_libexecdir}
+install subversion/mod_dav_svn/.libs/*.so $RPM_BUILD_ROOT%{_apachelibdir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf/65_mod_dav_svn.conf
 
 gzip -9nf BUGS CHANGES IDEAS INSTALL README
 
+cd subversion/bindings/swig/python
+python setup.py install --root=$RPM_BUILD_ROOT
+
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}
+
 %post
-/sbin/ldconfig
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %postun
-/sbin/ldconfig
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
 %post -n apache-mod_dav_svn
 if [ -f /var/lock/subsys/httpd ]; then
         /etc/rc.d/init.d/httpd restart 1>&2
@@ -176,13 +209,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc *.gz
 %attr(755,root,root) %{_bindir}/*
+%{_mandir}/man1/*
+%{_infodir}/svn*
+
+%files libs
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libsvn_[cdsw]*.so.*
 %attr(755,root,root) %{_libdir}/libsvn_ra.so.*
 %attr(755,root,root) %{_libdir}/libsvn_fs*.so*
 %attr(755,root,root) %{_libdir}/libsvn_ra_*.so*
 %attr(755,root,root) %{_libdir}/libsvn_repos.so*
-%{_mandir}/man1/*
-%{_infodir}/svn*
 
 %files devel
 %defattr(644,root,root,755)
@@ -195,7 +231,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
 
+%files python
+%defattr(644,root,root,755)
+%dir %{py_sitedir}/svn
+%{py_sitedir}/svn/*.py[co]
+%attr(755,root,root) %{py_sitedir}/svn/*.so
+
 %files -n apache-mod_dav_svn
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/httpd/httpd.conf/*_mod_dav_svn.conf
-%attr(755,root,root) %{_libexecdir}/*.so
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd/httpd.conf/*_mod_dav_svn.conf
+%attr(755,root,root) %{_apachelibdir}/*.so