diff --git a/.gitignore b/.gitignore index f13a69f..be4d91a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /rpm-4.10.0.tar.bz2 /rpm-4.10.1.tar.bz2 /rpm-4.10.90.git11989.tar.bz2 +/rpm-4.11.0-beta1.tar.bz2 diff --git a/rpm-4.10.90-caps-free.patch b/rpm-4.10.90-caps-free.patch deleted file mode 100644 index 79a7937..0000000 --- a/rpm-4.10.90-caps-free.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 34df9d81d15b596ea6f3f3f2e15bd0ec55323a19 -Author: Panu Matilainen -Date: Sat Nov 17 17:57:59 2012 +0200 - - Fix double-free on %caps in spec (RhBug:877512) - - - Fixes regression caused by dumb refactoring mistake in commit - 807ba93a6cf168410e3801347898949f356fcd6c - -diff --git a/build/files.c b/build/files.c -index d299cb9..10d7fff 100644 ---- a/build/files.c -+++ b/build/files.c -@@ -216,7 +216,6 @@ static void FileEntryFree(FileEntry entry) - { - freeAttrRec(&(entry->ar)); - argvFree(entry->langs); -- free(entry->caps); - memset(entry, 0, sizeof(*entry)); - } - diff --git a/rpm.spec b/rpm.spec index 0add029..b7308b4 100644 --- a/rpm.spec +++ b/rpm.spec @@ -11,9 +11,9 @@ %define rpmhome /usr/lib/rpm -%define rpmver 4.10.90 -%define snapver git11989 -%define srcver %{rpmver}%{?snapver:.%{snapver}} +%define rpmver 4.11.0 +%define snapver beta1 +%define srcver %{rpmver}%{?snapver:-%{snapver}} %define bdbname libdb %define bdbver 5.3.15 @@ -22,7 +22,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 @@ -46,7 +46,6 @@ Patch5: rpm-4.9.90-armhfp.patch Patch6: rpm-4.9.0-armhfp-logic.patch # Patches already in upstream -Patch100: rpm-4.10.90-caps-free.patch # These are not yet upstream Patch301: rpm-4.6.0-niagara.patch @@ -220,8 +219,6 @@ packages on a system. %patch3 -p1 -b .no-man-dirs %patch4 -p1 -b .use-gpg2 -%patch100 -p1 -b .caps-free - %patch301 -p1 -b .niagara %patch302 -p1 -b .geode %patch304 -p1 -b .ldflags @@ -454,6 +451,9 @@ exit 0 %doc COPYING doc/librpm/html/* %changelog +* Mon Dec 10 2012 Panu Matilainen - 4.11.0-0.beta1.1 +- update to 4.11 beta + * Mon Nov 19 2012 Panu Matilainen - 4.10.90-0.git11989.3 - package /usr/lib/rpm/macros.d directory (related to #846679) - fixup a bunch of old incorrect dates in spec changelog diff --git a/sources b/sources index cddbbf3..1132ebf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -674fc60129543a7378615adfd828681d rpm-4.10.90.git11989.tar.bz2 +cb71785390bf6a918cb185221d22ab04 rpm-4.11.0-beta1.tar.bz2