Djam/rpm
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/rpm.git synced 2025-02-23 18:33:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve __urlgetfile macro - take files from current folder if they exist

Browse source
This commit is contained in:
Denis Silakov 2014-09-03 05:42:52 -04:00
parent 7a715b0ba7
commit aef2ebb780
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rpm-5.4.10-turn-back-urlgetfile.patch
View file

@ -5,7 +5,7 @@ diff -Naur rpm-5.4.10.orig/macros/mandriva rpm-5.4.10/macros/mandriva
# mdvbz#64914
%_rpmgio .ufdio
+%__urlgetfile(url, dest) wget %1 -O %2 || (rm -f %2 && exit 1)
+%__urlgetfile(url, dest) (test -f `basename %1` && cp `basename %1` %2) || (wget %1 -O %2 || (rm -f %2 && exit 1))
+
# This will die as soon as remaining usage has been phased out...
%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}
@ -17,7 +17,7 @@ diff -Naur rpm-5.4.10.orig/macros/mandriva.in rpm-5.4.10/macros/mandriva.in
# mdvbz#64914
%_rpmgio .ufdio
+%__urlgetfile(url, dest) wget %1 -O %2 || (rm -f %2 && exit 1)
+%__urlgetfile(url, dest) (test -f `basename %1` && cp `basename %1` %2) || (wget %1 -O %2 || (rm -f %2 && exit 1))
+
# This will die as soon as remaining usage has been phased out...
%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}

2
rpm.spec
View file

@ -60,7 +60,7 @@ Summary: The RPM package management system
Name: rpm
Epoch: 1
Version: %{libver}.%{minorver}
Release: %{?prereldate:0.%{prereldate}.}43
Release: %{?prereldate:0.%{prereldate}.}44
License: LGPLv2.1+
Group: System/Configuration/Packaging
Url: http://rpm5.org/