File conflict apr vs. subversion

[Christoph Schug]

I guess following fix is required to install apr and subversion without
any conflicting files:

---8<---snipp---8<---

--- subversion.spec     26 Jul 2008 22:20:52 -0000      1.143
+++ subversion.spec     8 Aug 2008 16:51:26 -0000
@@ -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

--->8---snapp--->8---

Thanks in advance,
-cs

______________________________________________________________________
OpenPKG                                             http://openpkg.org
Developer Communication List                   openpkg-dev@openpkg.org