diff --git a/.gitignore b/.gitignore index 04bdeb9..54a81e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /rpm-4.13.0.1.tar.bz2 /rpm-4.14.0-rc1.tar.bz2 +/rpm-4.14.0.tar.bz2 diff --git a/python-rpm-generators.spec b/python-rpm-generators.spec index 22db8fa..6909ee9 100644 --- a/python-rpm-generators.spec +++ b/python-rpm-generators.spec @@ -27,14 +27,16 @@ # These macros are copied from the `rpm` package so it's trivial to keep # the two packages on the same upstream version. %global rpmver 4.14.0 -%global snapver rc1 +#global snapver rc2 +%global rel 1 + %global srcver %{version}%{?snapver:-%{snapver}} %global srcdir %{?snapver:testing}%{!?snapver:rpm-%(echo %{version} | cut -d'.' -f1-2).x} Name: python-rpm-generators Summary: Requires and Provides generators for Python RPMs Version: %{rpmver} -Release: %{?snapver:0.%{snapver}.}1%{?dist} +Release: %{?snapver:0.%{snapver}.}%{rel}%{?dist} License: GPLv2+ Url: http://www.rpm.org/ Source0: http://ftp.rpm.org/releases/%{srcdir}/%{srcname}-%{srcver}.tar.bz2 @@ -112,6 +114,10 @@ install -Dm 755 scripts/__pycache__/* \ %changelog +* Fri Oct 20 2017 Tomas Orsava - 4.14.0-1 +- Rebase to rpm 4.14.0 final (http://rpm.org/wiki/Releases/4.14.0) +- Re-synchronize version/release macros with the rpm Fedora package + * Mon Sep 18 2017 Tomas Orsava - 4.14.0-0.rc1.1 - Update to a new upstream version of RPM - Drop upstreamed patches diff --git a/sources b/sources index e954f25..88d74ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpm-4.14.0-rc1.tar.bz2) = f08c948c566e695083daeca2b9bac0e542821e12503c0d6fca4b1fd0584f74505ed24b48544147ec98290c65ee50807d9c2a9e7e35ef30ee77122bd1037a8375 +SHA512 (rpm-4.14.0.tar.bz2) = 938a46bfaf480741b72e11ad93fa1d2a5bce51f1e8ee206983a64e1cda0d7a0cf517f7658c98c93605d4ae9bede2d7305cf5754c7905820f3da64d8a860a0756