-+ if (headerGetEntry(pkg->header, RPMTAG_EPOCH, NULL, NULL, NULL) == 0) {
-+ int num = 0;
-+ headerAddEntry(pkg->header, RPMTAG_EPOCH, RPM_INT32_TYPE, &num, 1);
++ /* 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);