[rpm] - Update to rpm-4.12.0-rc1

[Panu Matilainen]

commit da2b22a298ea19687817e8f5a31733b9d45e2300
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Wed Aug 27 09:03:53 2014 +0300

    - Update to rpm-4.12.0-rc1

 rpm-4.12-beta-print-deps.patch         |   51 --------------------------------
 rpm-4.12-beta-rpmdeps.patch            |   29 ------------------
 rpm-4.12-beta-srpm-deps.patch          |   33 --------------------
 rpm-4.12-beta-triggerindex.patch       |   27 -----------------
 rpm-4.12-beta1-fix-buildrequires.patch |   41 -------------------------
 rpm-4.12-beta1-spec-header-deps.patch  |   47 -----------------------------
 rpm.spec                               |   14 +++-----
 7 files changed, 5 insertions(+), 237 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 37b689c..272f8a6 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -16,7 +16,7 @@
 %define rpmhome /usr/lib/rpm
 
 %define rpmver 4.12.0
-%define snapver beta1
+%define snapver rc1
 %define srcver %{rpmver}%{?snapver:-%{snapver}}
 %define eggver %{rpmver}%{?snapver:_%{snapver}}
 
@@ -27,7 +27,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}6%{?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
@@ -48,15 +48,8 @@ Patch3: rpm-4.9.90-no-man-dirs.patch
 Patch4: rpm-4.8.1-use-gpg2.patch
 
 # Patches already upstream:
-Patch100: rpm-4.12-beta1-fix-buildrequires.patch
-Patch101: rpm-4.12-beta1-spec-header-deps.patch
-Patch102: rpm-4.12-beta-triggerindex.patch
-Patch103: rpm-4.12-beta-print-deps.patch
-Patch104: rpm-4.12-beta-srpm-deps.patch
 
 # These are not yet upstream
-# Emergency hack for rpmdeps crash (#1131892)
-Patch300: rpm-4.12-beta-rpmdeps.patch
 Patch302: rpm-4.7.1-geode-i686.patch
 # Probably to be upstreamed in slightly different form
 Patch304: rpm-4.9.1.1-ld-flags.patch
@@ -533,6 +526,9 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Wed Aug 27 2014 Panu Matilainen <pmatilai at redhat.com> - 4.12.0-0.rc1.1
+- Update to rpm-4.12.0-rc1
+
 * Mon Aug 25 2014 Panu Matilainen <pmatilai at redhat.com> - 4.12.0-0.beta1.6
 - Resurrect dependency logging on package build
 - Resurrect rpmlib() dependencies in src.rpms