-# TODO:
-# - move modules to some directory (+ link with rpath)
-%define snap 20020724
%include /usr/lib/rpm/macros.python
+%define requires_eq_to() %(LC_ALL="C" echo '%2' | xargs -r rpm -q --qf 'Requires: %1 = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
+%define repov 4761
Summary: A Concurrent Versioning system similar to but better than CVS
-Summary(pl): System kontroli wersji ale lepszy ni¿ CVS
+Summary(pl): System kontroli wersji podobny, ale lepszy, ni¿ CVS
+Summary(pt_BR): Sistema de versionamento concorrente
Name: subversion
-Version: 0.14.0
-Release: 0.%{snap}
+Version: 0.24.1
+Release: 0.2
License: Apache/BSD Style
Group: Development/Version Control
-Source0: svn://svn.collab.net/repos/svn/trunk/%{name}-%{snap}.tar.gz
+#Source0Download: http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260
+Source0: http://subversion.tigris.org/files/documents/15/%{repov}/subversion-%{version}.tar.gz
+# Source0-md5: 8e1402528f0db97d9a187decddde89d1
Source1: %{name}-dav_svn.conf
-Patch0: %{name}-lib.patch
-Patch1: %{name}-python.patch
+Source2: %{name}-authz_svn.conf
URL: http://subversion.tigris.org/
-BuildRequires: apache-devel >= 2.0.39
-BuildRequires: apr-devel >= 2.0.39
+BuildRequires: apache-devel >= 2.0.46-0.2
+BuildRequires: apr-devel >= 2.0.46-0.2
BuildRequires: autoconf >= 2.53
BuildRequires: bison
-BuildRequires: db4-devel >= 4.0.14
+BuildRequires: db-devel >= 4.1.25
BuildRequires: expat-devel
BuildRequires: libtool >= 1.4-9
-BuildRequires: neon-devel >= 0.21.3
+BuildRequires: neon-devel >= 0.23.4
BuildRequires: python >= 2.2
BuildRequires: rpm-pythonprov >= 4.0.2-50
-BuildRequires: swig >= 1.3.12
+BuildRequires: swig >= 1.3.17
+BuildRequires: swig-python >= 1.3.17
BuildRequires: texinfo
+BuildRequires: docbook-style-xsl >= 1.60.1
Requires(post): /usr/sbin/fix-info-dir
Requires(postun): /usr/sbin/fix-info-dir
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
- Internacjonalizacja.
- Postêpuj±ce wsparcie dla wielu jêzyków.
+%description -l pt_BR
+O objetivo do projeto Subversion é construir um sistema de controle de
+versões que seja um substituto para o CVS (Concurrent Versioning
+System) na comunidade opensource, fornecendo grandes melhorias.
+
%package libs
Summary: Subversion libraries and modules
Summary(pl): Biblioteka subversion oraz ³adowalne modu³y
Group: Libraries
+Obsoletes: libsubversion0
%description libs
Subversion libraries and modules.
%package devel
Summary: Header files and develpment documentation for subversion
Summary(pl): Pliki nag³ówkowe i dokumetacja do subversion
+Summary(pt_BR): Arquivos de desenvolvimento para o Subversion
Group: Development/Libraries
Requires: %{name}-libs = %{version}
+Obsoletes: libsubversion0-devel
%description devel
Header files and develpment documentation for subversion.
%description devel -l pl
Pliki nag³ówkowe i dokumetacja do subversion.
+%description devel -l pt_BR
+Este pacote provê os arquivos necessários para desenvolvedores
+interagirem com o Subversion.
+
%package static
Summary: Static subversion library
Summary(pl): Biblioteka statyczna subversion
+Summary(pt_BR): Sistema de versionamento concorrente
Group: Development/Libraries
Requires: %{name}-devel = %{version}
+Obsoletes: libsubversion0-static-devel
%description static
Static subversion library.
%description static -l pl
Biblioteka statyczna subversion.
-%package python
+%description static -l pt_BR
+Este pacote provê um cliente estático do subversion.
+
+%package -n python-subversion
Summary: Subversion python bindings
Summary(pl): Dowi±zania do subversion dla pythona
+Summary(pt_BR): Módulos python para acessar os recursos do Subversion
Group: Development/Languages/Python
Requires: python >= 2.2
+Obsoletes: subversion-python
%pyrequires_eq python
-%description python
+%description -n python-subversion
Subversion python bindings.
-%description python -l pl
+%description -n python-subversion -l pl
Dowi±zania do subversion dla pythona.
+%description -n python-subversion -l pt_BR
+Módulos python para acessar os recursos do Subversion.
+
%package -n apache-mod_dav_svn
Summary: Apache module: Subversion Server
Summary(pl): Modu³ apache: Serwer Subversion
Group: Networking/Daemons
-Requires: apache >= 2.0.35
-Requires: apache-mod_dav >= 2.0.35
+%requires_eq_to apache apache-devel
+%requires_eq_to apache-mod_dav apache-devel
%description -n apache-mod_dav_svn
Apache module: Subversion Server.
-%description -n apache-mod_dav_svn
+%description -n apache-mod_dav_svn -l pl
Modu³ apache: Serwer Subversion.
+%package -n apache-mod_authz_svn
+Summary: Apache module: Subversion Server - path-based authorization
+Group: Networking/Daemons
+Requires: apache-mod_dav_svn = %{version}
+%requires_eq_to apache apache-devel
+%requires_eq_to apache-mod_dav apache-devel
+
+%description -n apache-mod_authz_svn
+Apache module: Subversion Server - path-based authorization.
+
%prep
-%setup -q -n %{name}-%{snap}
-%patch0 -p1
-%patch1 -p1
+%setup -q
%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
-rm -rf expat-lite/xmlrole* expat-lite/xmltok* neon apr
+# don't enable dso - currently it's broken
%configure \
- --enable-dso \
+ --disable-dso \
+ --disable-mod-activation \
--with-neon=%{_prefix} \
--with-apr=%{_bindir}/apr-config \
--with-apr-util=%{_bindir}/apu-config \
--with-apxs=%{_sbindir}/apxs \
--with-berkeley-db=%{_includedir}/db4:%{_libdir}
%{__make}
+%{__make} swig-py \
+ swig_pydir=%{py_sitedir}/libsvn \
+ swig_pydir_extra=%{py_sitedir}/svn
-cd subversion/bindings/swig/python
-CFLAGS="%{rpmcflags}" python setup.py build
+# build documentation; build process for documentation is severely
+# braindamaged -- authors suggests to untar docbook distribution in
+# build directory, hence the hack here
+%{__make} -C doc/book XSL_DIR=/usr/share/sgml/docbook/xsl-stylesheets/ all-html
+
+# prepare for %%doc below
+mv -f doc/book/book/html-chunk svn-handbook
+mkdir svn-handbook/images/
+cp -f doc/book/book/images/*.png svn-handbook/images/
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/httpd/httpd.conf,%{_apachelibdir}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/httpd/httpd.conf,%{_apachelibdir},%{_infodir}}
-%{__make} install \
- INSTALL_MOD_SHARED=echo \
+%{__make} \
+ install \
+ install-swig-py \
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}/%{name}
-
-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
+ swig_pydir=%{py_sitedir}/libsvn \
+ swig_pydir_extra=%{py_sitedir}/svn
-cd subversion/bindings/swig/python
-python setup.py install --root=$RPM_BUILD_ROOT
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf/65_mod_dav_svn.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf/66_mod_authz_svn.conf
+install doc/programmer/design/*.info* $RPM_BUILD_ROOT%{_infodir}/
%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%post
+%post devel
[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
-%postun
+%postun devel
[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
%post libs -p /sbin/ldconfig
%files
%defattr(644,root,root,755)
-%doc BUGS CHANGES IDEAS INSTALL README
-%attr(755,root,root) %{_bindir}/*
+%doc BUGS CHANGES COPYING IDEAS INSTALL README
+%doc svn-handbook doc/book/misc-docs/misc-docs.html
+%attr(755,root,root) %{_bindir}/svn*
+#%exclude %{_bindir}/svn-config
%{_mandir}/man1/*
-%{_infodir}/svn*
%files libs
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libsvn_*.so*
+%attr(755,root,root) %{_libdir}/lib*.so.*
%files devel
%defattr(644,root,root,755)
-%{_includedir}/%{name}
-%attr(755,root,root) %{_libdir}/lib*.la
+%{_includedir}/%{name}*
+#%attr(755,root,root) %{_bindir}/svn-config
+%attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
+%{_infodir}/svn*
%files static
%defattr(644,root,root,755)
%{_libdir}/lib*.a
-%files python
+%files -n python-subversion
%defattr(644,root,root,755)
%doc tools/backup tools/cvs2svn/*.py tools/examples/*.py
%dir %{py_sitedir}/svn
+%dir %{py_sitedir}/libsvn
%{py_sitedir}/svn/*.py[co]
-%attr(755,root,root) %{py_sitedir}/svn/*.so
+%{py_sitedir}/libsvn/*.py[co]
+%attr(755,root,root) %{py_sitedir}/libsvn/*.so
%files -n apache-mod_dav_svn
%defattr(644,root,root,755)
%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
+%attr(755,root,root) %{_apachelibdir}/mod_dav_svn.so
+
+%files -n apache-mod_authz_svn
+%defattr(644,root,root,755)
+%doc subversion/mod_authz_svn/INSTALL
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd/httpd.conf/*_mod_authz_svn.conf
+%attr(755,root,root) %{_apachelibdir}/mod_authz_svn.so
projects / packages / subversion.git / blobdiff