From: Elan Ruusamäe <glen@pld-linux.org>
Date: Wed, 6 Feb 2008 17:25:30 +0000 (+0000)
Subject: - with and without the patch it behaves no differently, and we have %epoch 0 in rpm... 
X-Git-Tag: auto/ac/rpm-build-macros-1_426-1~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=f05fb2d438967a36dd8f7d99e7a474b799bd5624

- with and without the patch it behaves no differently, and we have %epoch 0 in rpm macros

Changed files:
    rpm-epoch0.patch -> 1.6
---

diff --git a/rpm-epoch0.patch b/rpm-epoch0.patch
deleted file mode 100644
index 59b9f94..0000000
--- a/rpm-epoch0.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- rpm-4.3.orig/build/parsePreamble.c	2003-11-16 13:47:23.000000000 +0100
-+++ rpm-4.3/build/parsePreamble.c	2004-02-29 15:40:58.466804704 +0100
-@@ -942,6 +943,12 @@
- 	headerCopyTags(spec->packages->header, pkg->header,
- 			(uint32_t *)copyTagsDuringParse);
- 
-+    if (headerGetEntry(pkg->header, RPMTAG_EPOCH, NULL, NULL, NULL) == 0) {
-+    	int num = 0;
-+	headerAddEntry(pkg->header, RPMTAG_EPOCH, RPM_UINT32_TYPE, &num, 1);
-+	addMacro(spec->macros, "epoch", NULL, "0", RMIL_SPEC);
-+    }
-+    
-     if (checkForRequired(pkg->header, NVR) != RPMRC_OK)
- 	return RPMRC_FAIL;
-