[rpm] - Update to 4.12.0-beta1 - Fixes #1122004, #1111349, #1117912, #1123722 - Drop upstreamed patches

[Panu Matilainen]

commit 74824106c80bbd68a9a7bc16bf88a59ed2f4fabd
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Mon Aug 18 11:55:45 2014 +0300

    - Update to 4.12.0-beta1
    - Fixes #1122004, #1111349, #1117912, #1123722
    - Drop upstreamed patches

 .gitignore                        |    1 +
 rpm-4.11.90-arm-vfp3.patch        |   18 ------------------
 rpm-4.11.90-expand-load-arg.patch |   30 ------------------------------
 rpm-4.11.90-hardlink-groups.patch |   25 -------------------------
 rpm-4.11.90-mireskip.patch        |   24 ------------------------
 rpm.spec                          |   17 +++++++++--------
 sources                           |    2 +-
 7 files changed, 11 insertions(+), 106 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 632bb62..c24aff4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /rpm-4.11.2-rc2.tar.bz2
 /rpm-4.11.2.tar.bz2
 /rpm-4.11.90-git12844.tar.bz2
+/rpm-4.12.0-beta1.tar.bz2
diff --git a/rpm.spec b/rpm.spec
index b01c9ec..f835146 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -15,10 +15,10 @@
 
 %define rpmhome /usr/lib/rpm
 
-%define rpmver 4.11.90
-%define snapver git12844
+%define rpmver 4.12.0
+%define snapver beta1
 %define srcver %{rpmver}%{?snapver:-%{snapver}}
-%define eggver %{rpmver}
+%define eggver %{rpmver}%{?snapver:_%{snapver}}
 
 %define bdbname libdb
 %define bdbver 5.3.15
@@ -27,7 +27,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}5%{?dist}.1
+Release: %{?snapver:0.%{snapver}.}1%{?dist}.1
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -48,10 +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.11.90-hardlink-groups.patch
-Patch101: rpm-4.11.90-expand-load-arg.patch
-Patch102: rpm-4.11.90-arm-vfp3.patch
-Patch103: rpm-4.11.90-mireskip.patch
 
 # These are not yet upstream
 Patch302: rpm-4.7.1-geode-i686.patch
@@ -530,6 +526,11 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Mon Aug 18 2014 Panu Matilainen <pmatilai at redhat.com> - 4.12.0-0.beta1.1
+- Update to 4.12.0-beta1 (http://rpm.org/wiki/Releases/4.12.0)
+- Fixes #1122004, #1111349, #1117912, #1123722
+- Drop upstreamed patches
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.11.90-0.git12844.5.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index d75c90a..986a2bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c718e4c88cea11a67b182ea0101814aa  rpm-4.11.90-git12844.tar.bz2
+9ded158d121b8bde4b57b51e9d3859e8  rpm-4.12.0-beta1.tar.bz2