]> git.pld-linux.org Git - packages/rpm.git/commitdiff
- somebody had to write it eventually
authorsaq <saq@pld-linux.org>
Thu, 26 Feb 2004 22:54:08 +0000 (22:54 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    rpm-epoch0.patch -> 1.1

rpm-epoch0.patch [new file with mode: 0644]

diff --git a/rpm-epoch0.patch b/rpm-epoch0.patch
new file mode 100644 (file)
index 0000000..adcce50
--- /dev/null
@@ -0,0 +1,40 @@
+--- 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);
This page took 0.122062 seconds and 4 git commands to generate.