diff --git a/.gitignore b/.gitignore index 925bd5f..70ca289 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ wget-1.12.tar.bz2 /wget-1.17.tar.xz /wget-1.17.1.tar.xz /wget-1.18.tar.xz +/wget-1.19.tar.xz diff --git a/sources b/sources index 4fcd664..0a9c465 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -af9ca95a4bb8ac4a9bf10aeae66fa5ec wget-1.18.tar.xz +SHA512 (wget-1.19.tar.xz) = 2dd49d063dc3a210c4959b70ec301bb3ea5c6ba00c9a6407d0b79f8ab5a14534a2a1108b2013ff959e8089f706006d103c8794c6d638b954996873ca3ef481fc diff --git a/wget-rh-modified.patch b/wget-rh-modified.patch deleted file mode 100644 index 895392a..0000000 --- a/wget-rh-modified.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure~ 2011-09-13 03:15:38.000000000 -0500 -+++ configure 2011-12-16 09:19:34.574773958 -0600 -@@ -561,7 +561,7 @@ - PACKAGE_NAME='wget' - PACKAGE_TARNAME='wget' - PACKAGE_VERSION='1.18' --PACKAGE_STRING='wget 1.18' -+PACKAGE_STRING='wget 1.18 (Red Hat modified)' - PACKAGE_BUGREPORT='bug-wget@gnu.org' - PACKAGE_URL='' - diff --git a/wget.spec b/wget.spec index 0eef670..bd9196e 100644 --- a/wget.spec +++ b/wget.spec @@ -1,14 +1,13 @@ Summary: A utility for retrieving files using the HTTP or FTP protocols Name: wget -Version: 1.18 -Release: 2%{?dist} +Version: 1.19 +Release: 1%{?dist} License: GPLv3+ Group: Applications/Internet Url: http://www.gnu.org/software/wget/ Source: ftp://ftp.gnu.org/gnu/wget/wget-%{version}.tar.xz -Patch1: wget-rh-modified.patch -Patch2: wget-1.17-path.patch +Patch1: wget-1.17-path.patch Provides: webclient Provides: bundled(gnulib) @@ -30,8 +29,12 @@ support for Proxy servers, and configurability. %prep %setup -q -%patch1 -p0 -b .rh_modified -%patch2 -p1 -b .path + +# modify the package string +sed -i "s|\(PACKAGE_STRING='wget .*\)'|\1 (Red Hat modified)'|" configure +grep "PACKAGE_STRING='wget .* (Red Hat modified)'" configure || exit 1 + +%patch1 -p1 -b .path %build %configure \ @@ -78,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT %{_infodir}/* %changelog +* Fri Feb 10 2017 Tomas Hozza - 1.19-1 +- New upstream version 1.19 (#1419013) + * Tue Jul 26 2016 Tomas Hozza - 1.18-2 - Switched openssl to gnutls for crypto