%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 4218
+%define repov 5322
Summary: A Concurrent Versioning system similar to but better than CVS
Summary(pl): System kontroli wersji podobny, ale lepszy, ni¿ CVS
Summary(pt_BR): Sistema de versionamento concorrente
Name: subversion
-Version: 0.23.0
-Release: 0.2
+Version: 0.26.0
+Release: 0.1
License: Apache/BSD Style
Group: Development/Version Control
#Source0Download: http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260
Source0: http://subversion.tigris.org/files/documents/15/%{repov}/subversion-%{version}.tar.gz
-# Source0-md5: 59661f2145976437b371a0ab3a555dbd
+# Source0-md5: 700caa3f59b585d173812c4a078feeba
Source1: %{name}-dav_svn.conf
+Source2: %{name}-authz_svn.conf
URL: http://subversion.tigris.org/
-BuildRequires: apache-devel >= 2.0.46
-BuildRequires: apr-devel >= 2.0.46
+BuildRequires: apache-devel >= 2.0.47-0.2
+BuildRequires: apr-devel >= 2.0.47-0.2
BuildRequires: autoconf >= 2.53
BuildRequires: bison
BuildRequires: db-devel >= 4.1.25
+BuildRequires: docbook-style-xsl >= 1.60.1
BuildRequires: expat-devel
BuildRequires: libtool >= 1.4-9
-BuildRequires: neon-devel >= 0.23.4
+BuildRequires: neon-devel >= 0.24.0
BuildRequires: python >= 2.2
BuildRequires: rpm-pythonprov >= 4.0.2-50
+BuildRequires: rpmbuild(macros) >= 1.120
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)
Summary: Apache module: Subversion Server
Summary(pl): Modu³ apache: Serwer Subversion
Group: Networking/Daemons
-%requires_eq_to apache apache-devel
-%requires_eq_to apache-mod_dav apache-devel
+Requires: apache >= 2.0.47
+Requires: apache(modules-api) = %{apache_modules_api}
+Requires: apache-mod_dav
%description -n apache-mod_dav_svn
Apache module: Subversion Server.
%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
+Summary(pl): Modu³ apache: autoryzacja na podstawie ¶cie¿ki dla serwera Subversion
+Group: Networking/Daemons
+Requires: apache-mod_dav_svn = %{version}
+Requires: apache >= 2.0.47
+Requires: apache(modules-api) = %{apache_modules_api}
+
+%description -n apache-mod_authz_svn
+Apache module: Subversion Server - path-based authorization.
+
+%description -n apache-mod_authz_svn -l pl
+Modu³ apache: autoryzacja na podstawie ¶cie¿ki dla serwera Subversion.
+
%prep
%setup -q
%build
chmod +x ./autogen.sh && ./autogen.sh
+
# don't enable dso - currently it's broken
%configure \
--disable-dso \
--with-berkeley-db=%{_includedir}/db4:%{_libdir}
%{__make}
%{__make} swig-py \
- swig_pydir=%{py_sitedir}/svn
+ swig_pydir=%{py_sitedir}/libsvn \
+ swig_pydir_extra=%{py_sitedir}/svn
# build documentation; build process for documentation is severely
# braindamaged -- authors suggests to untar docbook distribution in
%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} \
+%{__make} LC_ALL=C \
install \
install-swig-py \
- INSTALL_MOD_SHARED=echo \
DESTDIR=$RPM_BUILD_ROOT \
- swig_pydir=%{py_sitedir}/svn
+ swig_pydir=%{py_sitedir}/libsvn \
+ swig_pydir_extra=%{py_sitedir}/svn
-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
+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
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%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
-%postun libs -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%post -n apache-mod_dav_svn
if [ -f /var/lock/subsys/httpd ]; then
fi
fi
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(644,root,root,755)
%doc BUGS CHANGES COPYING IDEAS INSTALL README
%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) %{_bindir}/svn-config
%attr(755,root,root) %{_libdir}/lib*.so
%{_libdir}/lib*.la
+%{_infodir}/svn*
%files static
%defattr(644,root,root,755)
%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