From c1e72162eab43cf5911c5007e4909dfbb5ff91799ab7cab43374604566c9f5f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20M=C3=B6llers?= Date: Thu, 12 Mar 2020 15:56:21 +0000 Subject: [PATCH] Accepting request 784362 from home:polslinux:branches:network:utilities - split lang files into separate lang package - add remove-env-from-shebang.patch OBS-URL: https://build.opensuse.org/request/show/784362 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wget?expand=0&rev=102 --- remove-env-from-shebang.patch | 8 ++++++++ wget.changes | 6 ++++++ wget.spec | 21 ++++++++++++++------- 3 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 remove-env-from-shebang.patch diff --git a/remove-env-from-shebang.patch b/remove-env-from-shebang.patch new file mode 100644 index 0000000..da5847a --- /dev/null +++ b/remove-env-from-shebang.patch @@ -0,0 +1,8 @@ +--- a/util/rmold.pl.orig 2020-03-12 16:35:43.520481987 +0100 ++++ b/util/rmold.pl 2020-03-12 16:35:49.244490296 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl -w ++#!/usr/bin/perl -w + + # Copyright (C) 1995-1997, 2007-2011, 2015, 2018-2019 Free Software + # Foundation, Inc. diff --git a/wget.changes b/wget.changes index afe4a53..9a3637e 100644 --- a/wget.changes +++ b/wget.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 12 14:53:52 UTC 2020 - Paolo Stivanin + +- split lang files into separate lang package +- add remove-env-from-shebang.patch + ------------------------------------------------------------------- Fri Apr 5 14:57:54 UTC 2019 - josef.moellers@suse.com diff --git a/wget.spec b/wget.spec index 4bfc633..38bcffd 100644 --- a/wget.spec +++ b/wget.spec @@ -1,7 +1,7 @@ # # spec file for package wget # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -23,7 +23,7 @@ Release: 0 Summary: A Tool for Mirroring FTP and HTTP Servers License: GPL-3.0-or-later Group: Productivity/Networking/Web/Utilities -Url: https://www.gnu.org/software/wget/ +URL: https://www.gnu.org/software/wget/ Source: https://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.gz Source1: https://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.gz.sig Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=wget&download=1#/wget.keyring @@ -33,6 +33,7 @@ Patch6: wget-1.14-no-ssl-comp.patch # PATCH-FIX-OPENSUSE fix pod syntax for perl 5.18 coolo@suse.de Patch7: wget-fix-pod-syntax.diff Patch8: wget-errno-clobber.patch +Patch9: remove-env-from-shebang.patch BuildRequires: automake BuildRequires: gpgme-devel >= 0.4.2 BuildRequires: libcares-devel @@ -68,6 +69,8 @@ BuildRequires: perl-IO-Socket-SSL Wget enables you to retrieve WWW documents or FTP files from a server. This can be done in script files or via the command line. +%lang_package + %prep %setup -q %patch0 -p1 @@ -77,6 +80,7 @@ This can be done in script files or via the command line. %patch6 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build %if 0%{?suse_version} > 1110 @@ -87,16 +91,17 @@ autoreconf --force --with-ssl=openssl \ --with-cares \ --with-metalink -make %{?_smp_mflags} V=1 +%make_build +sed -i 's/\/usr\/bin\/env perl -w/\/usr\/bin\/perl -w/' util/rmold.pl %check %if %{with regression_tests} -make %{?_smp_mflags} -C tests/ check +%make_build -C tests/ check %endif %install %make_install -%find_lang %{name} +%find_lang %{name} %{?no_lang_C} %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz @@ -104,7 +109,7 @@ make %{?_smp_mflags} -C tests/ check %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz -%files -f %{name}.lang +%files %license COPYING %doc AUTHORS NEWS README MAILING-LIST %doc doc/sample.wgetrc util/rmold.pl @@ -113,4 +118,6 @@ make %{?_smp_mflags} -C tests/ check %config(noreplace) %{_sysconfdir}/wgetrc %{_bindir}/* +%files lang -f %{name}.lang + %changelog