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: 27-Sep-2003 20:29:07
Branch: HEAD Handle: 2003092719290601
Modified files:
openpkg-src/openpkg HISTORY rpm.patch.bugfix rpm.patch.feature
rpm.patch.porting rpm.patch.regen
Log:
make %{error:<msg>} really stop SPEC processing
Summary:
Revision Changes Path
1.59 +1 -0 openpkg-src/openpkg/HISTORY
1.23 +2 -2 openpkg-src/openpkg/rpm.patch.bugfix
1.24 +20 -3 openpkg-src/openpkg/rpm.patch.feature
1.27 +1 -1 openpkg-src/openpkg/rpm.patch.porting
1.22 +1 -1 openpkg-src/openpkg/rpm.patch.regen
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.58 -r1.59 HISTORY
--- openpkg-src/openpkg/HISTORY 27 Sep 2003 11:13:50 -0000 1.58
+++ openpkg-src/openpkg/HISTORY 27 Sep 2003 18:29:06 -0000 1.59
@@ -2,6 +2,7 @@
2003
====
+20030927 make %{error:<msg>} really stop SPEC processing
20030927 add new macro %{l_openpkg_release} for expanding the release id
20030922 remove stale temporary files in /etc
20030918 use assembly code in BeeCrypt only for platform where it is known to work
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.22 -r1.23 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 18 Sep 2003 12:29:53 -0000 1.22
+++ openpkg-src/openpkg/rpm.patch.bugfix 27 Sep 2003 18:29:07 -0000 1.23
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 18-Sep-2003
+## Created on: 27-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -153,7 +153,7 @@
+---------------------------------------------------------------------------
Index: rpmio/macro.c
--- rpmio/macro.c 15 May 2003 13:42:01 -0000 1.1.1.7
-+++ rpmio/macro.c 11 Sep 2003 18:56:03 -0000
++++ rpmio/macro.c 27 Sep 2003 18:15:47 -0000
@@ -879,7 +882,7 @@
*/
/[EMAIL PROTECTED]@*/
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.23 -r1.24 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 18 Sep 2003 12:29:53 -0000 1.23
+++ openpkg-src/openpkg/rpm.patch.feature 27 Sep 2003 18:29:07 -0000 1.24
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 18-Sep-2003
+## Created on: 27-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -1113,7 +1113,7 @@
+---------------------------------------------------------------------------
Index: rpmio/macro.c
--- rpmio/macro.c 15 May 2003 13:42:01 -0000 1.1.1.7
-+++ rpmio/macro.c 11 Sep 2003 18:56:03 -0000
++++ rpmio/macro.c 27 Sep 2003 18:15:47 -0000
@@ -50,6 +50,9 @@
#include "debug.h"
@@ -1134,7 +1134,7 @@
+---------------------------------------------------------------------------
Index: rpmio/macro.c
--- rpmio/macro.c 15 May 2003 13:42:01 -0000 1.1.1.7
-+++ rpmio/macro.c 11 Sep 2003 18:56:03 -0000
++++ rpmio/macro.c 27 Sep 2003 18:15:47 -0000
@@ -1114,9 +1119,11 @@
case 2: /* COMPRESSED_BZIP2 */
sprintf(be, "%%_bzip2 %s", b);
@@ -1159,6 +1159,23 @@
} else if (((magic[0] == 0037) && (magic[1] == 0213)) || /* gzip */
((magic[0] == 0037) && (magic[1] == 0236)) || /* old gzip */
((magic[0] == 0037) && (magic[1] == 0036)) || /* pack */
+
++---------------------------------------------------------------------------
+| Make sure that an %{error:<msg>} macro really stops further
+| processing. Else it would be nothing more than a %{warn:<msg>}.
++---------------------------------------------------------------------------
+Index: rpmio/macro.c
+--- rpmio/macro.c 15 May 2003 13:42:01 -0000 1.1.1.7
++++ rpmio/macro.c 27 Sep 2003 18:15:47 -0000
+@@ -1329,7 +1337,7 @@
+ STREQ("error", f, fn)) {
+ int waserror = 0;
+ if (STREQ("error", f, fn))
+- waserror = 1;
++ waserror = 1, rc = 1;
+ if (g < ge)
+ doOutput(mb, waserror, g, gn);
+ else
+---------------------------------------------------------------------------
| Reactivate build mode aliases which were removed in rpm-4.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.26 -r1.27 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 18 Sep 2003 12:29:53 -0000 1.26
+++ openpkg-src/openpkg/rpm.patch.porting 27 Sep 2003 18:29:07 -0000 1.27
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 18-Sep-2003
+## Created on: 27-Sep-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.21 -r1.22 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 18 Sep 2003 12:29:53 -0000 1.21
+++ openpkg-src/openpkg/rpm.patch.regen 27 Sep 2003 18:29:07 -0000 1.22
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 18-Sep-2003
+## Created on: 27-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
