[packages/rpm.git] / rpm-epoch0.patch

--- rpm-4.3/build/parsePreamble.c.orig	2004-02-26 22:31:15.020274848 +0100
+++ rpm-4.3/build/parsePreamble.c	2004-02-26 22:33:33.616205064 +0100
@@ -455,6 +455,8 @@
 extern int noLang;
 /*@=redecl@*/
 
+static int noEpoch;
+
 /**
  */
 /*@-boundswrite@*/
@@ -626,6 +628,7 @@
 		     spec->lineNum, spec->line);
 	    return RPMERR_BADSPEC;
 	}
+	noEpoch = 0;
 	xx = headerAddEntry(pkg->header, tag, RPM_INT32_TYPE, &num, 1);
 	break;
     case RPMTAG_AUTOREQPROV:
@@ -865,6 +868,8 @@
     strcpy(NVR, "(main package)");
 
     pkg = newPackage(spec);
+    
+    noEpoch = 1;
 	
     if (! initialPackage) {
 	/* There is one option to %package: <pkg> or -n <pkg> */
@@ -932,6 +937,11 @@
     if (!spec->anyarch && checkForValidArchitectures(spec))
 	return RPMERR_BADSPEC;
 
+    if (noEpoch) {
+    	int num = 0;
+	headerAddEntry(pkg->header, RPMTAG_EPOCH, RPM_INT32_TYPE, &num, 1);
+    }
+
     if (pkg == spec->packages)
 	fillOutMainPackage(pkg->header);
Commit	Line	Data
90be4eb9	1	--- rpm-4.3/build/parsePreamble.c.orig 2004-02-26 22:31:15.020274848 +0100
	2	+++ rpm-4.3/build/parsePreamble.c 2004-02-26 22:33:33.616205064 +0100
	3	@@ -455,6 +455,8 @@
	4	extern int noLang;
	5	/@=redecl@/
	6
	7	+static int noEpoch;
	8	+
	9	/**
	10	*/
	11	/@-boundswrite@/
	12	@@ -626,6 +628,7 @@
	13	spec->lineNum, spec->line);
	14	return RPMERR_BADSPEC;
	15	}
	16	+ noEpoch = 0;
	17	xx = headerAddEntry(pkg->header, tag, RPM_INT32_TYPE, &num, 1);
	18	break;
	19	case RPMTAG_AUTOREQPROV:
	20	@@ -865,6 +868,8 @@
	21	strcpy(NVR, "(main package)");
	22
	23	pkg = newPackage(spec);
	24	+
	25	+ noEpoch = 1;
	26
	27	if (! initialPackage) {
	28	/* There is one option to %package: <pkg> or -n <pkg> */
	29	@@ -932,6 +937,11 @@
	30	if (!spec->anyarch && checkForValidArchitectures(spec))
	31	return RPMERR_BADSPEC;
	32
	33	+ if (noEpoch) {
	34	+ int num = 0;
	35	+ headerAddEntry(pkg->header, RPMTAG_EPOCH, RPM_INT32_TYPE, &num, 1);
	36	+ }
	37	+
	38	if (pkg == spec->packages)
	39	fillOutMainPackage(pkg->header);
	40