+# TODO:
+# - move modules to some directory (+ link with rpath)
+%define snap 20020412
+%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: 1
+Version: 0.11.0
+Release: 0.%{snap}
License: Apache/BSD Style
Group: Development/Version Control
-Source0: http://subversion.tigris.org/%{name}-r%{version}.tar.gz
+Source0: svn://svn.collab.net/repos/svn/trunk/%{name}-%{snap}.tar.gz
Source1: %{name}-dav_svn.conf
Patch0: %{name}-lib.patch
-Patch1: %{name}-apache2.patch
+Patch1: %{name}-python.patch
URL: http://subversion.tigris.org/
BuildRequires: apache-devel >= 2.0.35
+BuildRequires: apr-devel >= 2.0.35
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.0
+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
- 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.
%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
Group: Networking/Daemons
-Requires: apache(EAPI) >= 2.0.35
+Requires: apache >= 2.0.35
Requires: apache-mod_dav >= 2.0.35
-Requires(post): %{_sbindir}/apxs
-Requires(preun):%{_sbindir}/apxs
%description -n apache-mod_dav_svn
Apache module: Subversion Server.
Modu³ apache: Serwer Subversion.
%prep
-%setup -q -n %{name}-r%{version}
+%setup -q -n %{name}-%{snap}
%patch0 -p1
%patch1 -p1
%build
+chmod +x ./autogen.sh
./autogen.sh
# EXPAT is external so get rid of all except (patched) xmlparse.h
rm -rf expat-lite/[a-w]*.[ch] expat-lite/xmldef.h expat-lite/xmlparse.c
%configure \
--enable-dso \
--with-neon \
- --with-apr=%{_sbindir}/apr-config \
+ --with-apr=%{_bindir}/apr-config \
--with-apxs=%{_sbindir}/apxs \
--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,%{_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 \
libdir=$RPM_BUILD_ROOT%{_libdir} \
fs_libdir=$RPM_BUILD_ROOT%{_libdir} \
base_libdir=$RPM_BUILD_ROOT%{_libdir} \
+ swig_py_libdir=$RPM_BUILD_ROOT%{_libdir} \
bindir=$RPM_BUILD_ROOT%{_bindir} \
fs_bindir=$RPM_BUILD_ROOT%{_bindir} \
- includedir=$RPM_BUILD_ROOT%{_includedir}/svn
-done
+ includedir=$RPM_BUILD_ROOT%{_includedir}/%{name}
-install subversion/mod_dav_svn/.libs/*.so $RPM_BUILD_ROOT%{_libexecdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/mod_dav_svn.conf
+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
-%{_sbindir}/apxs -e -a -n dav_svn %{_libexecdir}/libmod_dav_svn.so 1>&2
-if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*mod_dav_svn.conf" /etc/httpd/httpd.conf; then
- echo "Include /etc/httpd/mod_dav_svn.conf" >> /etc/httpd/httpd.conf
-fi
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
%preun -n apache-mod_dav_svn
if [ "$1" = "0" ]; then
- %{_sbindir}/apxs -e -A -n dav_svn %{_libexecdir}/libmod_dav_svn.so 1>&2
- grep -v "^Include.*mod_dav_svn.conf" /etc/httpd/httpd.conf > \
- /etc/httpd/httpd.conf.tmp
- mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
fi
%files
%defattr(644,root,root,755)
-%doc *.gz
+%doc *.gz notes/*.gz
%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*
%{_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*
+
%files devel
%defattr(644,root,root,755)
-%{_includedir}/svn
-%attr(755,root,root) %{_libdir}/lib*.so
+%{_includedir}/%{name}
+%attr(755,root,root) %{_libdir}/libsvn_[cdsw]*.so
+%attr(755,root,root) %{_libdir}/libsvn_ra.so
%attr(755,root,root) %{_libdir}/lib*.la
%files static
%defattr(644,root,root,755)
%{_libdir}/lib*.a
+%files python
+%defattr(644,root,root,755)
+%doc tools/backup tools/cvs2svn/*.py tools/examples/*.py
+%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/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
projects / packages / subversion.git / blobdiff