OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Aug-2008 19:19:42
Branch: HEAD Handle: 2008080818194100
Modified files:
openpkg-src/subversion subversion.spec
Log:
resolve file conflict between apr and subversion
Summary:
Revision Changes Path
1.144 +5 -5 openpkg-src/subversion/subversion.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.spec
============================================================================
$ cvs diff -u -r1.143 -r1.144 subversion.spec
--- openpkg-src/subversion/subversion.spec 26 Jul 2008 22:20:52 -0000
1.143
+++ openpkg-src/subversion/subversion.spec 8 Aug 2008 17:19:41 -0000
1.144
@@ -40,7 +40,7 @@
Group: SCM
License: Apache/BSD
Version: %{V_opkg}
-Release: 20080727
+Release: 20080808
# package options
%option with_cvs2svn no
@@ -269,10 +269,10 @@
$RPM_BUILD_ROOT%{l_prefix}/lib/libsvn_neon.la
# strip down installation
- rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/apr-config
- rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/apu-config
- rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/apr.exp
- rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/aprutil.exp
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/apr-1-config
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/apu-1-config
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/apr-1.pc
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/apr-util-1.pc
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libexpat.*
rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion/neon
rmdir $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion >/dev/null 2>&1 ||
true
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
