- merge review changes (#226538)

- use version/release/... in buildroot tag
- remove BR perl
- use SMP flags
- use make install instead of %%makeinstall
- include copy of license
- use Requires(post)/Requires(preun)
- use optflags
- remove trailing dot from summary
- change tabs to spaces
This commit is contained in:
Karsten Hopp 2007-02-05 16:00:36 +00:00
parent f5d482102d
commit a2063cfafb

View File

@ -1,7 +1,7 @@
Summary: A utility for retrieving files using the HTTP or FTP protocols. Summary: A utility for retrieving files using the HTTP or FTP protocols
Name: wget Name: wget
Version: 1.10.2 Version: 1.10.2
Release: 12%{?dist} Release: 13%{?dist}
License: GPL License: GPL
Group: Applications/Internet Group: Applications/Internet
Url: http://wget.sunsite.dk/ Url: http://wget.sunsite.dk/
@ -16,9 +16,10 @@ Patch7: wget-1.10.2-218211.patch
Patch8: wget-1.10.2-retry186195.patch Patch8: wget-1.10.2-retry186195.patch
Patch9: wget-1.10.2-CVE-2006-6719.patch Patch9: wget-1.10.2-CVE-2006-6719.patch
Provides: webclient Provides: webclient
Prereq: /sbin/install-info Requires(post): /sbin/install-info
BuildRequires: perl, openssl-devel, pkgconfig, texinfo, gettext, autoconf Requires(preun): /sbin/install-info
BuildRoot: %{_tmppath}/%{name}-root BuildRequires: openssl-devel, pkgconfig, texinfo, gettext, autoconf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description %description
GNU Wget is a file retrieval utility which can use either the HTTP or GNU Wget is a file retrieval utility which can use either the HTTP or
@ -45,17 +46,17 @@ chmod a+x doc/texi2pod.pl
%build %build
if pkg-config openssl ; then if pkg-config openssl ; then
CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS
LDFLAGS=`pkg-config --libs openssl`; export LDFLAGS LDFLAGS=`pkg-config --libs openssl`; export LDFLAGS
fi fi
%configure --with-ssl --enable-LFS %configure --with-ssl --enable-LFS
make make %{?_smp_mflags}
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%makeinstall make install DESTDIR=$RPM_BUILD_ROOT CFLAGS="$RPM_OPT_FLAGS"
%find_lang %name %find_lang %{name}
%post %post
/sbin/install-info %{_infodir}/wget.info.gz %{_infodir}/dir || : /sbin/install-info %{_infodir}/wget.info.gz %{_infodir}/dir || :
@ -70,13 +71,25 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS MAILING-LIST NEWS README PATCHES TODO %doc AUTHORS MAILING-LIST NEWS README PATCHES TODO COPYING
%config(noreplace) %{_sysconfdir}/wgetrc %config(noreplace) %{_sysconfdir}/wgetrc
%{_mandir}/man1/wget.* %{_mandir}/man1/wget.*
%{_bindir}/wget %{_bindir}/wget
%{_infodir}/* %{_infodir}/*
%changelog %changelog
* Mon Feb 05 2007 Karsten Hopp <karsten@redhat.com> 1.10.2-13
- merge review changes (#226538)
- use version/release/... in buildroot tag
- remove BR perl
- use SMP flags
- use make install instead of %%makeinstall
- include copy of license
- use Requires(post)/Requires(preun)
- use optflags
- remove trailing dot from summary
- change tabs to spaces
* Thu Jan 18 2007 Karsten Hopp <karsten@redhat.com> 1.10.2-12 * Thu Jan 18 2007 Karsten Hopp <karsten@redhat.com> 1.10.2-12
- don't abort (un)install scriptlets when _excludedocs is set (Ville Skyttä) - don't abort (un)install scriptlets when _excludedocs is set (Ville Skyttä)