The %srcdir macro is presuming the version will have a format x.y.z

and fails when presented with a longer version `4.13.0.1`.

In addition, the download location changed from `rpm.org` to `ftp.rpm.org`.

Resolves: #1447417
This commit is contained in:
Florian Festi 2017-05-03 16:13:44 +02:00
parent 968a569040
commit ebc71181c9

View File

@ -24,7 +24,7 @@
%global rpmver 4.13.0.1 %global rpmver 4.13.0.1
#global snapver rc2 #global snapver rc2
%global srcver %{version}%{?snapver:-%{snapver}} %global srcver %{version}%{?snapver:-%{snapver}}
%global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(v=%{version}; echo ${v%.*}.x)} %global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x}
%define bdbname libdb %define bdbname libdb
%define bdbver 5.3.15 %define bdbver 5.3.15
@ -36,7 +36,7 @@ Version: %{rpmver}
Release: %{?snapver:0.%{snapver}.}20%{?dist} Release: %{?snapver:0.%{snapver}.}20%{?dist}
Group: System Environment/Base Group: System Environment/Base
Url: http://www.rpm.org/ Url: http://www.rpm.org/
Source0: http://rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2 Source0: http://ftp.rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2
%if %{with int_bdb} %if %{with int_bdb}
Source1: db-%{bdbver}.tar.gz Source1: db-%{bdbver}.tar.gz
%else %else