- massive attack: no need for 755 for *.la

[packages/subversion.git] / subversion.spec

diff --git a/subversion.spec b/subversion.spec
index a227db9c117f076090294bed35c04919c72446be..4476c6dc05f97b6271dceffde010c5db4acc5663 100644 (file)
--- a/subversion.spec
+++ b/subversion.spec
@@ -1,30 +1,28 @@
-# TODO:
-# - move modules to some directory (+ link with rpath)
-%define        snap    20020412
+%define        repov   3252
 %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
+Summary:       A Concurrent Versioning system similar to but better than CVS
+Summary(pl):   System kontroli wersji ale lepszy ni¿ CVS
 Name:          subversion
-Version:       0.11.0
-Release:       0.%{snap}
+Version:       0.14.3
+Release:       r%{repov}.0
 License:       Apache/BSD Style
 Group:         Development/Version Control
-Source0:       svn://svn.collab.net/repos/svn/trunk/%{name}-%{snap}.tar.gz
+Source0:       svn://svn.collab.net/repos/svn/trunk/%{name}-r%{repov}.tar.gz
 Source1:       %{name}-dav_svn.conf
 Patch0:                %{name}-lib.patch
 Patch1:                %{name}-python.patch
 URL:           http://subversion.tigris.org/
-BuildRequires: apache-devel >= 2.0.35
-BuildRequires: apr-devel >= 2.0.35
+BuildRequires: apache-devel >= 2.0.42
+BuildRequires: apr-devel >= 2.0.42
 BuildRequires: autoconf >= 2.53
 BuildRequires: bison
 BuildRequires: db4-devel >= 4.0.14
 BuildRequires: expat-devel
 BuildRequires: libtool >= 1.4-9
-BuildRequires: neon-devel >= 0.19.2
+BuildRequires: neon-devel >= 0.23.4
 BuildRequires: python >= 2.2
 BuildRequires: rpm-pythonprov >= 4.0.2-50
-BuildRequires: swig >= 1.3.11
+BuildRequires: swig >= 1.3.15
 BuildRequires: texinfo
 Requires(post):        /usr/sbin/fix-info-dir
 Requires(postun):      /usr/sbin/fix-info-dir
@@ -105,25 +103,26 @@ Static subversion library.
 %description static -l pl
 Biblioteka statyczna subversion.
 
-%package python
+%package -n python-subversion
 Summary:       Subversion python bindings
 Summary(pl):   Dowi±zania do subversion dla pythona
 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.
 
 %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   apache
+%requires_eq   apache-mod_dav
 
 %description -n apache-mod_dav_svn
 Apache module: Subversion Server.
@@ -132,20 +131,19 @@ Apache module: Subversion Server.
 Modu³ apache: Serwer Subversion.
 
 %prep
-%setup -q -n %{name}-%{snap}
+%setup -q -n %{name}-r%{repov}
 %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
-rm -rf expat-lite/xmlrole* expat-lite/xmltok* neon apr
+chmod +x ./autogen.sh && ./autogen.sh
+# don't enable dso - currently it's broken
 %configure \
-       --enable-dso \
-       --with-neon \
+       --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}
@@ -159,20 +157,11 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/httpd/httpd.conf,%{_apachelibdir}}
 
 %{__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}/%{name}
+       DESTDIR=$RPM_BUILD_ROOT
 
 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
 
@@ -207,31 +196,28 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz notes/*.gz
-%attr(755,root,root) %{_bindir}/*
+%doc  BUGS CHANGES 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) %{_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*
+%attr(755,root,root) %{_libdir}/lib*.so.*
 
 %files devel
 %defattr(644,root,root,755)
-%{_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
+%{_includedir}/%{name}*
+%attr(755,root,root) %{_bindir}/svn-config
+%attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
 
 %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