diff --git a/.gitignore b/.gitignore index 274e67d..7f75177 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /rpm-4.11.90-git12844.tar.bz2 /rpm-4.12.0-beta1.tar.bz2 /rpm-4.12.0-rc1.tar.bz2 +/rpm-4.12.0.tar.bz2 diff --git a/rpm-4.12.0-rc1-rpmlibdep.patch b/rpm-4.12.0-rc1-rpmlibdep.patch deleted file mode 100644 index 5720c92..0000000 --- a/rpm-4.12.0-rc1-rpmlibdep.patch +++ /dev/null @@ -1,68 +0,0 @@ -commit cac311c2ddb43b62ad9dbdb5543d50848eb9fd65 -Author: Panu Matilainen -Date: Tue Sep 9 12:58:08 2014 +0300 - - Regression the 13th: The Final Friday - - - Yet another regression from the recent dependency refactoring and - ensuing patches-on-patches-on-patches work: some rpmlib() dependencies - (payload, tilde) are added as late as writeRPM(), those have been going - to /dev/null recently. - - The fix actually removing code is probably a good sign... - -diff --git a/build/pack.c b/build/pack.c -index d25449f..74471d9 100644 ---- a/build/pack.c -+++ b/build/pack.c -@@ -438,6 +438,17 @@ static rpmRC writeRPM(Package pkg, unsigned char ** pkgidp, - if (haveTildeDep(pkg->header)) - (void) rpmlibNeedsFeature(pkg, "TildeInVersions", "4.10.0-1"); - -+ /* All dependencies added finally, write them into the header */ -+ for (int i = 0; i < PACKAGE_NUM_DEPS; i++) { -+ /* Nuke any previously added dependencies from the header */ -+ headerDel(pkg->header, rpmdsTagN(pkg->dependencies[i])); -+ headerDel(pkg->header, rpmdsTagEVR(pkg->dependencies[i])); -+ headerDel(pkg->header, rpmdsTagF(pkg->dependencies[i])); -+ headerDel(pkg->header, rpmdsTagTi(pkg->dependencies[i])); -+ /* ...and add again, now with automatic dependencies included */ -+ rpmdsPutToHeader(pkg->dependencies[i], pkg->header); -+ } -+ - /* Create and add the cookie */ - if (cookie) { - rasprintf(cookie, "%s %d", buildHost(), (int) (*getBuildTime())); -@@ -623,16 +634,6 @@ rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating) - headerPutString(pkg->header, RPMTAG_BUILDHOST, buildHost()); - headerPutUint32(pkg->header, RPMTAG_BUILDTIME, getBuildTime(), 1); - -- for (int i=0; iheader, rpmdsTagN(pkg->dependencies[i])); -- headerDel(pkg->header, rpmdsTagEVR(pkg->dependencies[i])); -- headerDel(pkg->header, rpmdsTagF(pkg->dependencies[i])); -- headerDel(pkg->header, rpmdsTagTi(pkg->dependencies[i])); -- /* ...and add again, now with automatic dependencies included */ -- rpmdsPutToHeader(pkg->dependencies[i], pkg->header); -- } -- - if (spec->sourcePkgId != NULL) { - headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16); - } -@@ -714,16 +715,6 @@ rpmRC packageSources(rpmSpec spec, char **cookie) - headerPutString(sourcePkg->header, RPMTAG_BUILDHOST, buildHost()); - headerPutUint32(sourcePkg->header, RPMTAG_BUILDTIME, getBuildTime(), 1); - -- for (int i=0; iheader, rpmdsTagN(sourcePkg->dependencies[i])); -- headerDel(sourcePkg->header, rpmdsTagEVR(sourcePkg->dependencies[i])); -- headerDel(sourcePkg->header, rpmdsTagF(sourcePkg->dependencies[i])); -- headerDel(sourcePkg->header, rpmdsTagTi(sourcePkg->dependencies[i])); -- /* ...and add again, now with automatic dependencies included */ -- rpmdsPutToHeader(sourcePkg->dependencies[i], sourcePkg->header); -- } -- - /* XXX this should be %_srpmdir */ - { char *fn = rpmGetPath("%{_srcrpmdir}/", spec->sourceRpmName,NULL); - char *pkgcheck = rpmExpand("%{?_build_pkgcheck_srpm} ", fn, NULL); diff --git a/rpm.spec b/rpm.spec index 881099d..fad5ada 100644 --- a/rpm.spec +++ b/rpm.spec @@ -16,7 +16,7 @@ %define rpmhome /usr/lib/rpm %define rpmver 4.12.0 -%define snapver rc1 +#define snapver rc1 %define srcver %{rpmver}%{?snapver:-%{snapver}} %define eggver %{rpmver}%{?snapver:_%{snapver}} @@ -27,10 +27,10 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: %{?snapver:0.%{snapver}.}2%{?dist} +Release: %{?snapver:0.%{snapver}.}1%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ -Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2 +Source0: http://rpm.org/releases/rpm-4.12.x/%{name}-%{srcver}.tar.bz2 %if %{with int_bdb} Source1: db-%{bdbver}.tar.gz %else @@ -48,7 +48,6 @@ Patch3: rpm-4.9.90-no-man-dirs.patch Patch4: rpm-4.8.1-use-gpg2.patch # Patches already upstream: -Patch100: rpm-4.12.0-rc1-rpmlibdep.patch # These are not yet upstream Patch302: rpm-4.7.1-geode-i686.patch @@ -527,6 +526,9 @@ exit 0 %doc doc/librpm/html/* %changelog +* Tue Sep 16 2014 Panu Matilainen - 4.12.0-1 +- Update to rpm-4.12.0 final (http://rpm.org/wiki/Releases/4.12.0) + * Tue Sep 02 2014 Panu Matilainen - 4.12.0-0.rc1.2 - Resurrect payload and tilde rpmlib() dependencies diff --git a/sources b/sources index 01d3378..8e6f228 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fbc9b72ddfdafe07230e6d54a9b50f09 rpm-4.12.0-rc1.tar.bz2 +cfa6a605d3f21219a689b0fc2b0f1bcc rpm-4.12.0.tar.bz2