OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Mar-2005 13:56:18
Branch: HEAD Handle: 2005030812561800
Modified files:
openpkg-src/subversion subversion.spec
Log:
adjusted APR installation
Summary:
Revision Changes Path
1.86 +23 -1 openpkg-src/subversion/subversion.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.spec
============================================================================
$ cvs diff -u -r1.85 -r1.86 subversion.spec
--- openpkg-src/subversion/subversion.spec 8 Mar 2005 11:05:59 -0000
1.85
+++ openpkg-src/subversion/subversion.spec 8 Mar 2005 12:56:18 -0000
1.86
@@ -108,6 +108,10 @@
%patch -p0
%{l_shtool} subst %{l_value -s -a} \
subversion/bindings/swig/perl/native/Makefile.PL.in
+ %{l_shtool} subst \
+ -e '/^<Layout apr>/,/<\/Layout>/{ s;\(^[ ]*prefix:\).*$;\1
%{l_prefix}; ;s;\(^[ ]*sysconfdir:\).*$;\1 %{l_prefix}/etc/subversion; }' \
+ apr/config.layout \
+ apr-util/config.layout
%build
# configure package
@@ -161,6 +165,20 @@
# install package
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
+ ( cd $RPM_BUILD_ROOT%{l_prefix}/include/apr-0
+ for i in *; do
+ mv $i ../subversion-1/svn_$i
+ done
+ ) || exit $?
+ %{l_shtool} subst \
+ -e 's;^\(#include <\)\(apr.*\)$;\1svn_\2;' \
+ $RPM_BUILD_ROOT/%{l_prefix}/include/subversion-1/svn*.h
+ ( cd $RPM_BUILD_ROOT%{l_prefix}/lib
+ for i in libapr*; do
+ mv $i `echo "$i" | sed -e 's;^libapr\(.*\)$;libsnv_apr\1;'`
+ done
+ ) || exit $?
+
%if "%{with_perl}" == "yes"
%{l_make} %{l_mflags} install-swig-pl DESTDIR=$RPM_BUILD_ROOT
%endif
@@ -169,7 +187,11 @@
%endif
# strip down installation
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/subversion-1/mod_dav_svn.h
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/apr-config
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/apr-0
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/include/subversion-1/svn-revision.txt
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/include/subversion-1/mod_dav_svn.h
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/apr.exp
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
rm -rf $RPM_BUILD_ROOT%{l_prefix}/build
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/neon*
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
