OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-Apr-2004 08:54:16
Branch: HEAD Handle: 2004041507541500
Modified files:
openpkg-src/libedit libedit.spec
Log:
resolve file conflict with GNU readline
Summary:
Revision Changes Path
1.5 +2 -1 openpkg-src/libedit/libedit.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libedit/libedit.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 libedit.spec
--- openpkg-src/libedit/libedit.spec 17 Feb 2004 08:44:11 -0000 1.4
+++ openpkg-src/libedit/libedit.spec 15 Apr 2004 06:54:15 -0000 1.5
@@ -34,7 +34,7 @@
Group: Terminal
License: BSD
Version: 2.6.7
-Release: 20040207
+Release: 20040415
# package options
%option with_readline no
@@ -82,6 +82,7 @@
%install
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install PREFIX=$RPM_BUILD_ROOT%{l_prefix}
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man3/history.3
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
