OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Sep-2006 13:44:05
Branch: HEAD Handle: 2006091312440500
Modified files:
openpkg-src/apr apr.spec
Log:
at least tomcat native needs the files in build and share. There is a
conflicting file with subversion, as subversion seems to carry some
parts of the Apache2 apr aswell
Summary:
Revision Changes Path
1.32 +2 -4 openpkg-src/apr/apr.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
============================================================================
$ cvs diff -u -r1.31 -r1.32 apr.spec
--- openpkg-src/apr/apr.spec 14 Apr 2006 08:17:41 -0000 1.31
+++ openpkg-src/apr/apr.spec 13 Sep 2006 11:44:05 -0000 1.32
@@ -33,7 +33,7 @@
Group: System
License: Apache
Version: 1.2.7
-Release: 20060414
+Release: 20060913
# list of sources
Source0: http://www.apache.org/dist/apr/apr-%{version}.tar.gz
@@ -49,7 +49,7 @@
PreReq: db
AutoReq: no
AutoReqProv: no
-Conflicts: apache2
+Conflicts: apache2, subversion
%description
Apache Portable Runtime (APR) is a library of C data structures
@@ -105,8 +105,6 @@
( cd apr-util-%{version}
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
) || exit $?
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/build
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/share
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/apr.exp
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.la
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
