OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Oct-2007 09:19:48
Branch: HEAD Handle: 2007100508194800
Modified files:
openpkg-src/editline editline.spec
openpkg-src/libedit libedit.spec
Log:
editline and libedit file conflict each other
Summary:
Revision Changes Path
1.15 +2 -1 openpkg-src/editline/editline.spec
1.36 +1 -0 openpkg-src/libedit/libedit.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/editline/editline.spec
============================================================================
$ cvs diff -u -r1.14 -r1.15 editline.spec
--- openpkg-src/editline/editline.spec 1 Jan 2007 17:37:39 -0000
1.14
+++ openpkg-src/editline/editline.spec 5 Oct 2007 07:19:48 -0000
1.15
@@ -33,7 +33,7 @@
Group: Terminal
License: BSD
Version: 1.12
-Release: 20061013
+Release: 20071005
# list of sources
Source0:
http://http.us.debian.org/debian/pool/main/e/editline/editline_%{version}.orig.tar.gz
@@ -46,6 +46,7 @@
PreReq: OpenPKG, openpkg >= 20040130
AutoReq: no
AutoReqProv: no
+Conflicts: libedit
%description
Editline is a C library for convenient command line editing.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libedit/libedit.spec
============================================================================
$ cvs diff -u -r1.35 -r1.36 libedit.spec
--- openpkg-src/libedit/libedit.spec 5 Oct 2007 07:16:30 -0000 1.35
+++ openpkg-src/libedit/libedit.spec 5 Oct 2007 07:19:48 -0000 1.36
@@ -50,6 +50,7 @@
PreReq: OpenPKG, openpkg >= 20040130
AutoReq: no
AutoReqProv: no
+Conflicts: editline
%description
Libedit is terminal library for convenient command line editing.
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
