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: 06-Oct-2003 18:42:44
Branch: HEAD Handle: 2003100617424202
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpm.patch.bugfix
rpm.patch.feature rpm.patch.porting
rpm.patch.regen
openpkg-web news.txt
Log:
add OpenPKG branding to 'rpm --version' output
Summary:
Revision Changes Path
1.63 +1 -0 openpkg-src/openpkg/HISTORY
1.226 +1 -1 openpkg-src/openpkg/openpkg.spec
1.25 +1 -1 openpkg-src/openpkg/rpm.patch.bugfix
1.26 +54 -3 openpkg-src/openpkg/rpm.patch.feature
1.29 +1 -1 openpkg-src/openpkg/rpm.patch.porting
1.24 +1 -1 openpkg-src/openpkg/rpm.patch.regen
1.6875 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.62 -r1.63 HISTORY
--- openpkg-src/openpkg/HISTORY 5 Oct 2003 10:59:50 -0000 1.62
+++ openpkg-src/openpkg/HISTORY 6 Oct 2003 16:42:43 -0000 1.63
@@ -2,6 +2,7 @@
2003
====
+20031006 add OpenPKG branding to "rpm --version" output
20031005 check availability of unpacking tools in .src.sh script
20030929 upgrade to latest OSSP platform script to recognize even more platforms
20030928 add partial UnixWare 7.1.x support to bootstrap; add IRIX, UnixWare and
QNX support to "platform"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.225 -r1.226 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 5 Oct 2003 10:59:50 -0000 1.225
+++ openpkg-src/openpkg/openpkg.spec 6 Oct 2003 16:42:44 -0000 1.226
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20031005
+%define V_openpkg 20031006
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.24 -r1.25 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 28 Sep 2003 12:20:24 -0000 1.24
+++ openpkg-src/openpkg/rpm.patch.bugfix 6 Oct 2003 16:42:44 -0000 1.25
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 28-Sep-2003
+## Created on: 06-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.25 -r1.26 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 28 Sep 2003 12:20:24 -0000 1.25
+++ openpkg-src/openpkg/rpm.patch.feature 6 Oct 2003 16:42:44 -0000 1.26
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 28-Sep-2003
+## Created on: 06-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -1243,7 +1243,7 @@
+---------------------------------------------------------------------------
Index: rpmqv.c
--- rpmqv.c 4 Mar 2003 15:32:57 -0000 1.1.1.8
-+++ rpmqv.c 15 Sep 2003 19:02:34 -0000
++++ rpmqv.c 6 Oct 2003 15:34:41 -0000
@@ -682,6 +682,10 @@
case 'b':
ba->buildAmount |= RPMBUILD_PACKAGEBINARY;
@@ -1325,7 +1325,7 @@
+---------------------------------------------------------------------------
Index: rpm.c
--- rpm.c 16 May 2002 16:55:25 -0000 1.1.1.23
-+++ rpm.c 18 Sep 2003 11:15:08 -0000
++++ rpm.c 6 Oct 2003 15:34:35 -0000
@@ -1016,6 +1016,10 @@
if (oldPackage && !upgrade)
@@ -1337,3 +1337,54 @@
if (noPgp && bigMode != MODE_CHECKSIG)
argerror(_("--nopgp may only be used during signature checking"));
+
++---------------------------------------------------------------------------
+| Add OpenPKG branding to make sure people do not intermix
+| this RPM version with the stock RPM version.
++---------------------------------------------------------------------------
+Index: lib/poptALL.c
+--- lib/poptALL.c 25 Jun 2003 19:10:01 -0000 1.1.1.3
++++ lib/poptALL.c 6 Oct 2003 15:34:56 -0000
+@@ -102,7 +102,7 @@
+ /[EMAIL PROTECTED] rpmEVR, fileSystem @*/
+ /[EMAIL PROTECTED] *fp, fileSystem @*/
+ {
+- fprintf(fp, _("RPM version %s\n"), rpmEVR);
++ fprintf(fp, _("OpenPKG RPM %s\n"), rpmEVR);
+ }
+
+ /**
+
++---------------------------------------------------------------------------
+| Add OpenPKG branding to make sure people do not intermix
+| this RPM version with the stock RPM version.
++---------------------------------------------------------------------------
+Index: rpm.c
+--- rpm.c 16 May 2002 16:55:25 -0000 1.1.1.23
++++ rpm.c 6 Oct 2003 15:34:35 -0000
+@@ -235,7 +235,7 @@
+ static void printHelpLine(char * prefix, char * help);
+
+ static void printVersion(void) {
+- fprintf(stdout, _("RPM version %s\n"), rpmEVR);
++ fprintf(stdout, _("OpenPKG RPM %s\n"), rpmEVR);
+ }
+
+ static void printBanner(void) {
+
++---------------------------------------------------------------------------
+| Add OpenPKG branding to make sure people do not intermix
+| this RPM version with the stock RPM version.
++---------------------------------------------------------------------------
+Index: rpmqv.c
+--- rpmqv.c 4 Mar 2003 15:32:57 -0000 1.1.1.8
++++ rpmqv.c 6 Oct 2003 15:34:41 -0000
+@@ -126,7 +126,7 @@
+ /[EMAIL PROTECTED] rpmEVR, fileSystem @*/
+ /[EMAIL PROTECTED] *fp, fileSystem @*/
+ {
+- fprintf(fp, _("RPM version %s\n"), rpmEVR);
++ fprintf(fp, _("OpenPKG RPM %s\n"), rpmEVR);
+ }
+
+ static void printBanner(FILE * fp)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.28 -r1.29 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 28 Sep 2003 12:20:24 -0000 1.28
+++ openpkg-src/openpkg/rpm.patch.porting 6 Oct 2003 16:42:44 -0000 1.29
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 28-Sep-2003
+## Created on: 06-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.23 -r1.24 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 28 Sep 2003 12:20:24 -0000 1.23
+++ openpkg-src/openpkg/rpm.patch.regen 6 Oct 2003 16:42:44 -0000 1.24
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 28-Sep-2003
+## Created on: 06-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6874 -r1.6875 news.txt
--- openpkg-web/news.txt 6 Oct 2003 15:55:03 -0000 1.6874
+++ openpkg-web/news.txt 6 Oct 2003 16:42:42 -0000 1.6875
@@ -1,3 +1,4 @@
+06-Oct-2003: Upgraded package: P<openpkg-20031006-20031006>
06-Oct-2003: Upgraded package: P<tiff-3.6.0-20031006>
06-Oct-2003: Upgraded package: P<bash-2.05b-20031006>
06-Oct-2003: Upgraded package: P<vim-6.2.106-20031006>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
