From ced3ab0e8831d42aa68da879dd18a269b1f6e2fc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Fri, 26 Oct 2012 00:17:36 +0200 Subject: [PATCH] - looks like epoch0 patch is applied upstream within ifdef VENDOR_PLD --- rpm-epoch0.patch | 24 ------------------------ rpm.spec | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 rpm-epoch0.patch diff --git a/rpm-epoch0.patch b/rpm-epoch0.patch deleted file mode 100644 index b596179..0000000 --- a/rpm-epoch0.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- rpm-5.0.2/build/parsePreamble.c 2007-12-31 18:21:47.000000000 +0200 -+++ rpm-5.0.2-epoch0/build/parsePreamble.c 2008-02-17 20:17:38.000000000 +0200 -@@ -1082,6 +1082,21 @@ - headerCopyTags(spec->packages->header, pkg->header, - (uint32_t *)copyTagsDuringParse); - -+ /* Add Epoch: 0 to package header if it was not set by spec */ -+ he->tag = RPMTAG_NAME; -+ if (headerGet(spec->packages->header, he, 0) == 0) { -+ uint32_t num = 0; -+ -+ he->tag = RPMTAG_EPOCH; -+ he->t = RPM_UINT32_TYPE; -+ he->p.ui32p = # -+ he->c = 1; -+ xx = headerPut(pkg->header, he, 0); -+ -+ /* also declare %{epoch} to be same */ -+ addMacro(spec->macros, "epoch", NULL, "0", RMIL_SPEC); -+ } -+ - if (checkForRequired(pkg->header, NVR) != RPMRC_OK) - return RPMRC_FAIL; - diff --git a/rpm.spec b/rpm.spec index 4c61583..c44484a 100644 --- a/rpm.spec +++ b/rpm.spec @@ -102,7 +102,6 @@ Patch9: %{name}-lua.patch Patch10: %{name}-php-deps.patch Patch11: %{name}-notsc.patch Patch12: %{name}-hack-norpmlibdep.patch -Patch13: %{name}-epoch0.patch Patch14: %{name}-perl_req-INC_dirs.patch Patch15: %{name}-debuginfo.patch Patch16: vendor-pld.patch @@ -798,7 +797,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch11 -p1 %endif %patch12 -p1 -%patch13 -p1 %patch14 -p0 %patch15 -p1 %patch16 -p1 -- 2.44.0