OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 27-Nov-2002 15:51:43
Branch: HEAD Handle: 2002112714514201
Modified files:
openpkg-src/openpkg-tool openpkg-tool.spec openpkg.1 openpkg.pod
openpkg-web news.txt
Log:
no, backout too aggressive fixes and fix it differently
Summary:
Revision Changes Path
1.4 +9 -18 openpkg-src/openpkg-tool/openpkg-tool.spec
1.2 +5 -5 openpkg-src/openpkg-tool/openpkg.1
1.4 +1 -1 openpkg-src/openpkg-tool/openpkg.pod
1.2127 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/openpkg-tool/openpkg-tool.spec
============================================================
$ cvs diff -u -r1.3 -r1.4 openpkg-tool.spec
--- openpkg-src/openpkg-tool/openpkg-tool.spec 27 Nov 2002 14:10:35 -0000
1.3
+++ openpkg-src/openpkg-tool/openpkg-tool.spec 27 Nov 2002 14:51:43 -0000
1.4
@@ -40,13 +40,14 @@
Source1: openpkg-index.pl
Source2: openpkg-build.pl
Source3: openpkg.pod
-Source4: Makefile
+Source4: openpkg.1
+Source5: Makefile
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, make, perl
-PreReq: OpenPKG, openpkg >= 20020206, perl
+BuildPreReq: OpenPKG, openpkg >= 20020206
+PreReq: OpenPKG, openpkg >= 20020206
AutoReq: no
AutoReqProv: no
@@ -54,19 +55,8 @@
The OpenPKG tool is a helper utility for managing an OpenPKG instance.
%prep
- %setup -c -T
- cp -f %{SOURCE0} .
- cp -f %{SOURCE1} .
- cp -f %{SOURCE2} .
- cp -f %{SOURCE3} .
- cp -f %{SOURCE4} .
%build
- %{l_shtool} subst \
- -e 's;@l_prefix@;%{l_prefix};g' \
- -e 's;@version@;%{version};g' \
- openpkg.pod
- %{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ -77,16 +67,17 @@
%{l_shtool} install -c -m 755 \
-e 's;@l_prefix@;%{l_prefix};g' \
-e 's;@version@;%{version};g' \
- openpkg.sh $RPM_BUILD_ROOT%{l_prefix}/bin/openpkg
+ %{SOURCE openpkg.sh} $RPM_BUILD_ROOT%{l_prefix}/bin/openpkg
%{l_shtool} install -c -m 644 \
- openpkg.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
+ -e 's;XX-VERSION-XX;%{version};g' \
+ %{SOURCE openpkg.1} $RPM_BUILD_ROOT%{l_prefix}/man/man1/
%{l_shtool} install -c -m 755 \
-e 's;@l_prefix@;%{l_prefix};g' \
- openpkg-index.pl \
+ %{SOURCE openpkg-index.pl} \
$RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/
%{l_shtool} install -c -m 755 \
-e 's;@l_prefix@;%{l_prefix};g' \
- openpkg-build.pl \
+ %{SOURCE openpkg-build.pl} \
$RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
Index: openpkg-src/openpkg-tool/openpkg.1
============================================================
$ cvs diff -u -r1.1 -r1.2 openpkg.1
--- openpkg-src/openpkg-tool/openpkg.1 26 Nov 2002 19:54:11 -0000 1.1
+++ openpkg-src/openpkg-tool/openpkg.1 27 Nov 2002 14:51:43 -0000 1.2
@@ -129,12 +129,12 @@
.\" ========================================================================
.\"
.IX Title "OPENPKG 1"
-.TH OPENPKG 1 "2002-11-26" "openpkg-tool" "OpenPKG Maintainance"
+.TH OPENPKG 1 "2002-11-27" "openpkg-tool" "OpenPKG Maintainance"
.SH "NAME"
\&\fBopenpkg\fR \- \fBOpenPKG\fR maintainance utility
.SH "VERSION"
.IX Header "VERSION"
-openpkg-tool \f(CW@version\fR@
+openpkg-tool XX-VERSION-XX
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
\&\fBopenpkg\fR
@@ -174,7 +174,7 @@
.IX Header "COMMANDS"
.Sh "\s-1OPENPKG\s0 \s-1INDEX\s0"
.IX Subsection "OPENPKG INDEX"
-\&\fBopenpkg-index\fR creates an \s-1XML/RDF\s0 based resource index for \s-1RPM\s0
+\&\fBopenpkg index\fR creates an \s-1XML/RDF\s0 based resource index for \s-1RPM\s0
\&\fI.spec\fR files in a source tree or from an \s-1RPM\s0 package repository. The
index holds enough information to support an automated build process by
\&\fBopenpkg build\fR.
@@ -189,7 +189,7 @@
\&\fBopenpkg index\fR adds a platform attribute for binary RPMs. The
attribute is built as
\fI%{arch}\fR\f(CW\*(C`\-\*(C'\fR\fIplatform\fR\f(CW\*(C`\-\*(C'\fR\fI%{os}\fR where
\&\fI%{arch}\fR and \fI%{os}\fR are taken from the \s-1RPM\s0 header and
\fIplatform\fR is
-the value of the \fB\-p\fR option. The default value is "\f(CW\*(C`unkown\*(C'\fR".
This
+the value of the \fB\-p\fR option. The default value is
"\f(CW\*(C`unknown\*(C'\fR". This
must be used to distinguish between platforms that support the same
Architecture and \s-1OS\s0 name like various Linux distributions.
.IP "\fB\-C\fR \fIcache.db\fR" 4
@@ -255,7 +255,7 @@
is already installed.
.IP "\fB\-Z\fR" 4
.IX Item "-Z"
-\&\fBopenpkg build\fR ignores a installed packages, the
+\&\fBopenpkg build\fR ignores all installed packages, the
script will rebuild all selected packages from scratch.
Note that this doesn't work together with the \fB\-a\fR option.
.IP "\fB\-i\fR" 4
Index: openpkg-src/openpkg-tool/openpkg.pod
============================================================
$ cvs diff -u -r1.3 -r1.4 openpkg.pod
--- openpkg-src/openpkg-tool/openpkg.pod 27 Nov 2002 13:14:50 -0000 1.3
+++ openpkg-src/openpkg-tool/openpkg.pod 27 Nov 2002 14:51:43 -0000 1.4
@@ -32,7 +32,7 @@
=head1 VERSION
-openpkg-tool @version@
+openpkg-tool XX-VERSION-XX
=head1 SYNOPSIS
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.2126 -r1.2127 news.txt
--- openpkg-web/news.txt 27 Nov 2002 11:14:21 -0000 1.2126
+++ openpkg-web/news.txt 27 Nov 2002 14:51:42 -0000 1.2127
@@ -1,3 +1,4 @@
+27-Nov-2002: Upgraded package: P<cfg-0.9.0-20020730>
27-Nov-2002: Upgraded package: P<openpkg-20021127-20021127>
27-Nov-2002: Upgraded package: P<bash-2.05b-20021127>
27-Nov-2002: Upgraded package: P<squid-2.5.1-20021127>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
