From b1ec72fa5cda3c328da8ff964889939cd840132c Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 4 Feb 2013 09:28:53 +0200 Subject: [PATCH] - update to 4.11.0.1 --- .gitignore | 1 + rpm-4.10.90-rpmlib-filesystem-check.patch | 2 +- rpm.spec | 8 +++++--- sources | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index be4d91a..5b9ca86 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /rpm-4.10.1.tar.bz2 /rpm-4.10.90.git11989.tar.bz2 /rpm-4.11.0-beta1.tar.bz2 +/rpm-4.11.0.1.tar.bz2 diff --git a/rpm-4.10.90-rpmlib-filesystem-check.patch b/rpm-4.10.90-rpmlib-filesystem-check.patch index 1390354..ec4324c 100644 --- a/rpm-4.10.90-rpmlib-filesystem-check.patch +++ b/rpm-4.10.90-rpmlib-filesystem-check.patch @@ -117,7 +117,7 @@ diff -up rpm-4.10.90.git11978/lib/depends.c.rpmlib-filesystem-check rpm-4.10.90. if (dsflags & RPMSENSE_RPMLIB) { - if (tsmem->rpmlib == NULL) + if (tsmem->rpmlib == NULL) { - rpmdsRpmlibPool(tsmem->pool, &(tsmem->rpmlib), NULL); + rpmdsRpmlibPool(rpmtsPool(ts), &(tsmem->rpmlib), NULL); + CheckFilesystemHierarchy(&(tsmem->rpmlib), rpmtsRootDir(ts)); + } diff --git a/rpm.spec b/rpm.spec index 516273f..269c6b6 100644 --- a/rpm.spec +++ b/rpm.spec @@ -11,8 +11,7 @@ %define rpmhome /usr/lib/rpm -%define rpmver 4.11.0 -%define snapver beta1 +%define rpmver 4.11.0.1 %define srcver %{rpmver}%{?snapver:-%{snapver}} %define bdbname libdb @@ -22,7 +21,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: %{?snapver:0.%{snapver}.}3%{?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 @@ -451,6 +450,9 @@ exit 0 %doc COPYING doc/librpm/html/* %changelog +* Mon Feb 04 2013 Panu Matilainen - 4.11.0.1-1 +- update to 4.11.0.1 (http://rpm.org/wiki/Releases/4.11.0.1) + * Tue Jan 29 2013 Panu Matilainen - 4.11.0-0.beta1.3 - revert yesterdays ghost-fix, it eats rpmdb's on upgrades diff --git a/sources b/sources index 1132ebf..0cbad85 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb71785390bf6a918cb185221d22ab04 rpm-4.11.0-beta1.tar.bz2 +b35f5359e0d4494d7b11e8d0c1512a0d rpm-4.11.0.1.tar.bz2