add brotli build-dependency

- restore formerly-empty sample files
- remove a couple of obsolete workarounds for installing
This commit is contained in:
Thomas E. Dickey 2024-01-22 13:34:33 +01:00 committed by Lukáš Zaoral
parent 797941c011
commit 91ed704d79
No known key found for this signature in database
GPG Key ID: 39157506DD67752D
2 changed files with 25 additions and 9 deletions

View File

@ -1,7 +1,7 @@
From bccfb8ac43da56cb1f53c4b421e09dcac1fd1af0 Mon Sep 17 00:00:00 2001 From bccfb8ac43da56cb1f53c4b421e09dcac1fd1af0 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com> From: Kamil Dudka <kdudka@redhat.com>
Date: Wed, 13 Feb 2013 15:17:08 +0100 Date: Wed, 13 Feb 2013 15:17:08 +0100
Subject: [PATCH] lynx-2.8.6-redhat.patch rebased for 2.9.0dev.12 Subject: [PATCH] lynx-2.8.6-redhat.patch rebased for 2.9.0
--- ---
lynx.cfg | 18 ++++++++++++------ lynx.cfg | 18 ++++++++++++------

View File

@ -5,7 +5,7 @@ Summary: A text-based Web browser
Name: lynx Name: lynx
Version: 2.9.0 Version: 2.9.0
#Release: %%{devrel}.1%%{?dist} #Release: %%{devrel}.1%%{?dist}
Release: 2%{?dist} Release: 3%{?dist}
License: GPL-2.0-only License: GPL-2.0-only
Source0: https://invisible-island.net/archives/lynx/tarballs/lynx%{version}%{devrel}.tar.bz2 Source0: https://invisible-island.net/archives/lynx/tarballs/lynx%{version}%{devrel}.tar.bz2
@ -28,6 +28,7 @@ Patch2: lynx-CVE-2008-4690.patch
Provides: webclient Provides: webclient
Provides: text-www-browser Provides: text-www-browser
BuildRequires: brotli-devel
BuildRequires: dos2unix BuildRequires: dos2unix
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gettext BuildRequires: gettext
@ -63,6 +64,20 @@ sed -e 's,^STARTFILE:.*,STARTFILE:file:/usr/share/doc/HTML/en-US/index.html,' -i
%endif %endif
%build %build
# These options are specified explicitly below but are also defaults in 2.9.0:
# --enable-addrlist-page
# --enable-cjk
# --enable-file-upload
# --enable-japanese-utf8
# --enable-justify-elts
# --enable-locale-charset
# --enable-persistent-cookies
# --enable-prettysrc
# --enable-read-eta
# --enable-scrollbar
# --enable-source-cache
# --with-brotli
# --with-zlib
%configure --libdir=/etc \ %configure --libdir=/etc \
--disable-font-switch \ --disable-font-switch \
--disable-rpath-hack \ --disable-rpath-hack \
@ -92,19 +107,18 @@ sed -e 's,^STARTFILE:.*,STARTFILE:file:/usr/share/doc/HTML/en-US/index.html,' -i
--enable-warnings \ --enable-warnings \
--with-screen=ncursesw \ --with-screen=ncursesw \
--with-ssl=%{_libdir} \ --with-ssl=%{_libdir} \
--with-brotli \
--with-zlib \ --with-zlib \
--without-bzlib \
ac_cv_path_RLOGIN=/usr/bin/rlogin ac_cv_path_RLOGIN=/usr/bin/rlogin
%make_build %make_build
# remove zero-length tests files to silence rpmlint
rm -fv test/X test/nobody
%install %install
chmod -x samples/mailto-form.pl chmod -x samples/mailto-form.pl
%make_install %make_install
# remove unneeded files with incompatible encoding # remove unneeded files
rm -f docs/{OS-390.announce,README.jp} rm -f docs/{OS-390.announce,README.jp}
rm -f samples/*.bat rm -f samples/*.bat
@ -112,9 +126,6 @@ rm -f samples/*.bat
dos2unix samples/lynx-demo.cfg dos2unix samples/lynx-demo.cfg
dos2unix samples/midnight.lss dos2unix samples/midnight.lss
# Install Lang dependent resources
mkdir -p $RPM_BUILD_ROOT/usr/share/locale/ja/LC_MESSAGES/
cat >$RPM_BUILD_ROOT%{_sysconfdir}/lynx-site.cfg <<EOF cat >$RPM_BUILD_ROOT%{_sysconfdir}/lynx-site.cfg <<EOF
# Place any local lynx configuration options (proxies etc.) here. # Place any local lynx configuration options (proxies etc.) here.
EOF EOF
@ -132,6 +143,11 @@ EOF
%config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg %config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg
%changelog %changelog
* Mon Jan 22 2024 Thomas E. Dickey <dickey@invisible-island.net> - 2.9.0-3
- add brotli build-dependency
- restore formerly-empty sample files
- remove a couple of obsolete workarounds for installing
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-2 * Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild