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 openpkg-web Date: 14-Jul-2003 14:38:24
Branch: HEAD Handle: 2003071413382102
Modified files:
openpkg-src/openpkg-rc openpkg-rc.spec
openpkg-web news.txt
Log:
resolve conflict with new wrapper in bootstrap
Summary:
Revision Changes Path
1.7 +2 -2 openpkg-src/openpkg-rc/openpkg-rc.spec
1.5556 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-rc/openpkg-rc.spec
============================================================================
$ cvs diff -u -r1.6 -r1.7 openpkg-rc.spec
--- openpkg-src/openpkg-rc/openpkg-rc.spec 11 Jul 2003 14:08:36 -0000 1.6
+++ openpkg-src/openpkg-rc/openpkg-rc.spec 14 Jul 2003 12:38:23 -0000 1.7
@@ -33,7 +33,7 @@
Group: Utility
License: GPL
Version: 0.7.3
-Release: 20030711
+Release: 20030714
# list of sources
Source0: ftp://ftp.ossp.org/pkg/tool/rc/rc-%{version}.tar.gz
@@ -71,7 +71,7 @@
$RPM_BUILD_ROOT%{l_prefix}/man/man5 \
$RPM_BUILD_ROOT%{l_prefix}/man/man8
%{l_shtool} install -s -c -m 755 \
- rc $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/
+ rc $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rcng
%{l_shtool} install -c -m 644 \
%{SOURCE rc.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.fixme
%{l_shtool} install -c -m 644 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5555 -r1.5556 news.txt
--- openpkg-web/news.txt 14 Jul 2003 12:22:27 -0000 1.5555
+++ openpkg-web/news.txt 14 Jul 2003 12:38:21 -0000 1.5556
@@ -1,3 +1,4 @@
+14-Jul-2003: Upgraded package: P<openpkg-rc-0.7.3-20030714>
14-Jul-2003: Upgraded package: P<j2se14-1.4.2-20030714>
14-Jul-2003: Upgraded package: P<gnutls-0.8.9-20030714>
14-Jul-2003: Upgraded package: P<gnet-1.1.9-20030714>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
