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: 15-Aug-2005 11:27:25
Branch: HEAD Handle: 2005081510272500
Modified files:
openpkg-src/subversion subversion.spec
Log:
backout parts of the recent changes: there is already a local copy of
exactly Neon 0.24.7 shipped with Subversion 1.2.1 (hence we don't need
to include a second one) and remove the (temporarily) installed Neon
files (as they are not required under run-time by Subversion AFAIK)
Summary:
Revision Changes Path
1.97 +3 -5 openpkg-src/subversion/subversion.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.spec
============================================================================
$ cvs diff -u -r1.96 -r1.97 subversion.spec
--- openpkg-src/subversion/subversion.spec 9 Aug 2005 15:15:37 -0000
1.96
+++ openpkg-src/subversion/subversion.spec 15 Aug 2005 09:27:25 -0000
1.97
@@ -26,7 +26,6 @@
%define V_dist 1.2.1
%define V_opkg 1.2.1
%define V_tools 20050706
-%define V_neon 0.24.7
# package information
Name: subversion
@@ -39,7 +38,7 @@
Group: SCM
License: Apache/BSD
Version: %{V_opkg}
-Release: 20050809
+Release: 20050815
# package options
%option with_cvs2svn no
@@ -53,7 +52,6 @@
Source2: subversion.config
Source3: subversion.servers
Source4: rc.subversion
-Source5: http://www.webdav.org/neon/neon-%{V_neon}.tar.gz
Patch0: subversion.patch
# build information
@@ -106,8 +104,6 @@
%prep
%setup -q
%setup -q -T -D -a 1
- %setup -q -T -D -a 5
- mv neon-%{V_neon} neon
%patch -p0
# substitute path from applied patch
@@ -215,6 +211,8 @@
# strip down installation
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/apr-config
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/apr.exp
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion/neon
+ rmdir $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion
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
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
