From dcc21c353fd2a8b161bbad0f977f427561c7fe6b Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 3 Nov 2016 13:33:38 +0200 Subject: [PATCH] Rebase to rpm 4.13.0 final --- .gitignore | 1 + rpm.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f7dd76b..e658a99 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /rpm-4.12.90.tar.bz2 /rpm-4.13.0-rc1.tar.bz2 /rpm-4.13.0-rc2.tar.bz2 +/rpm-4.13.0.tar.bz2 diff --git a/rpm.spec b/rpm.spec index 6f12f4a..f63953f 100644 --- a/rpm.spec +++ b/rpm.spec @@ -18,7 +18,7 @@ %define rpmhome /usr/lib/rpm %global rpmver 4.13.0 -%global snapver rc2 +#global snapver rc2 %global srcver %{version}%{?snapver:-%{snapver}} %global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(v=%{version}; echo ${v%.*}.x)} @@ -29,7 +29,7 @@ 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/%{srcdir}/%{name}-%{srcver}.tar.bz2 @@ -556,6 +556,9 @@ exit 0 %doc doc/librpm/html/* %changelog +* Thu Nov 03 2016 Panu Matilainen - 4.13.0-1 +- Rebase to rpm 4.13.0 final (http://rpm.org/wiki/Releases/4.13.0) + * Wed Nov 02 2016 Panu Matilainen - 4.13.0-0.rc2.2 - Fix harmless unused variable warning from fedora-specspo patch diff --git a/sources b/sources index 589e4b7..ff2961f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e5f31e745bfe3cbfccc5e869b0c84feb rpm-4.13.0-rc2.tar.bz2 +f64e70c7548911da51a11651a789e30e rpm-4.13.0.tar.bz2