Browse Source

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)

Ralf S. Engelschall 20 years ago
parent
commit
14cfc2d7f8
1 changed files with 3 additions and 5 deletions
  1. 3 5
      subversion/subversion.spec

+ 3 - 5
subversion/subversion.spec

@@ -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 @@ Class:        BASE
 Group:        SCM
 License:      Apache/BSD
 Version:      %{V_opkg}
-Release:      20050809
+Release:      20050815
 
 #   package options
 %option       with_cvs2svn  no
@@ -53,7 +52,6 @@ Source1:      ftp://ftp.openpkg.org/sources/CPY/subversion/subversion-tools-%{V_
 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 @@ AutoReqProv:  no
 %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 @@ AutoReqProv:  no
     #   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