[rpm] - Update to rpm-4.12.0 final

[Panu Matilainen]

commit 814137c1a787386abf23296269370ea8cfb9ab00
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Tue Sep 16 13:53:02 2014 +0300

    - Update to rpm-4.12.0 final

 .gitignore                     |    1 +
 rpm-4.12.0-rc1-rpmlibdep.patch |   68 ----------------------------------------
 rpm.spec                       |   10 +++--
 sources                        |    2 +-
 4 files changed, 8 insertions(+), 73 deletions(-)
---
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.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 <pmatilai at redhat.com> - 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 <pmatilai at redhat.com> - 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