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: 30-Oct-2006 09:21:02
Branch: HEAD Handle: 2006103008210200
Modified files:
openpkg-src/subversion subversion.spec
Log:
resolve even more file conflicts (libexpat is platform dependent for
still unknown reasons)
Summary:
Revision Changes Path
1.116 +5 -0 openpkg-src/subversion/subversion.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.spec
============================================================================
$ cvs diff -u -r1.115 -r1.116 subversion.spec
--- openpkg-src/subversion/subversion.spec 30 Oct 2006 07:33:07 -0000
1.115
+++ openpkg-src/subversion/subversion.spec 30 Oct 2006 08:21:02 -0000
1.116
@@ -238,8 +238,13 @@
$RPM_BUILD_ROOT/%{l_prefix}/include/subversion-1/svn*.h
( cd $RPM_BUILD_ROOT%{l_prefix}/lib
for i in libapr*; do
+ [ ".$i" = ".libapr*" ] && continue
mv $i `echo "$i" | sed -e 's;^libapr\(.*\)$;libsvn_apr\1;'`
done
+ for i in libexpat*; do
+ [ ".$i" = ".libexpat*" ] && continue
+ mv $i `echo "$i" | sed -e 's;^libexpat\(.*\)$;libsvn_expat\1;'`
+ done
) || exit $?
# strip down installation
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
