diff --git a/.gitignore b/.gitignore index 78614f4..ea2c300 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /rpm-4.13.90-git14002.tar.bz2 /rpm-4.14.0-rc1.tar.bz2 /rpm-4.14.0-rc2.tar.bz2 +/rpm-4.14.0.tar.bz2 diff --git a/rpm.spec b/rpm.spec index fb53ed3..b833796 100644 --- a/rpm.spec +++ b/rpm.spec @@ -30,8 +30,8 @@ %define rpmhome /usr/lib/rpm %global rpmver 4.14.0 -%global snapver rc2 -%global rel 6 +#global snapver rc2 +%global rel 1 %global srcver %{version}%{?snapver:-%{snapver}} %global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x} @@ -646,6 +646,9 @@ make check %doc doc/librpm/html/* %changelog +* Thu Oct 12 2017 Panu Matilainen - 4.14.0-1 +- Rebase to rpm 4.14.0 final (http://rpm.org/wiki/Releases/4.14.0) + * Tue Oct 10 2017 Troy Dawson - 4.14.0-0.rc2.6 - Cleanup spec file conditionals diff --git a/sources b/sources index a698e59..6cb4316 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpm-4.14.0-rc2.tar.bz2) = b244eda033de8f4e04ffafbcb6279f35eb832a883f00b115afc77ac4684c54937f7c071689a33bb94cc343336894c6b5dec772dc34ad38d57f2d702d0bb9ff0d +SHA512 (rpm-4.14.0.tar.bz2) = df6c063b4c30c3652cdf09e709b96f89b61c89aa4726b25f1132a51da3da67e33598d8acaf0134fad27ad4b38c619b9e1d77571697f2efa227fcfcac56651c82