do not depend on perl

This commit is contained in:
Kamil Dudka 2017-07-25 13:21:48 +02:00
parent 915175cbb6
commit 414a4a5964
2 changed files with 25 additions and 12 deletions

View File

@ -4,9 +4,9 @@ Date: Wed, 13 Feb 2013 15:17:08 +0100
Subject: [PATCH] lynx-2.8.6-redhat.patch rebased for 2.8.9
---
lynx.cfg | 15 +++++++++++----
lynx.cfg | 18 ++++++++++++------
userdefs.h | 18 +++++++++---------
2 files changed, 20 insertions(+), 13 deletions(-)
2 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/lynx.cfg b/lynx.cfg
index f01782f..ccc0846 100644
@ -33,6 +33,15 @@ index f01782f..ccc0846 100644
#
# As an alternative, you may want to use a local URL. A good choice for this is
# the user's home directory:
@@ -142,7 +144,7 @@ HELPFILE:http://lynx.invisible-island.net/lynx_help/lynx_help_main.html
# An index to your CWIS can be placed here or a document containing
# pointers to lots of interesting places on the web.
#
-DEFAULT_INDEX_FILE:http://scout.wisc.edu/
+DEFAULT_INDEX_FILE:http://www.google.com/
.h1 Interaction
@@ -454,7 +456,7 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/
# Find RFC 1345 at
.url http://tools.ietf.org/html/rfc1345
@ -42,18 +51,26 @@ index f01782f..ccc0846 100644
.h2 LOCALE_CHARSET
# LOCALE_CHARSET overrides CHARACTER_SET if true, using the current locale to
@@ -1847,6 +1849,10 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/
@@ -467,7 +469,7 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/
# values and their relationship to the locale value is not. GNU libiconv
# happens to give useful values, but other implementations are not guaranteed
# to do this.
-#LOCALE_CHARSET:FALSE
+LOCALE_CHARSET:TRUE
.h2 HTML5_CHARSETS
# HTML5_CHARSETS is an alternative to ASSUME_CHARSET and ASSUME_LOCAL_CHARSET.
@@ -1847,6 +1849,9 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/
.ex
#DOWNLOADER:Save OS/390 binary file: iconv -f IBM-1047 -t ISO8859-1 %s >%s:FALSE
+# Added by Red Hat:
+DOWNLOADER:View with less:less %s:TRUE
+
+
.h1 Interaction
.h2 NO_DOT_FILES
@@ -3447,6 +3453,7 @@ COLOR:6:brightred:black
@@ -3447,6 +3452,7 @@ COLOR:6:brightred:black
#ENABLE_LYNXRC:VI_KEYS:ON
#ENABLE_LYNXRC:VISITED_LINKS:ON
.fi

View File

@ -35,7 +35,6 @@ BuildRequires: telnet
BuildRequires: unzip
BuildRequires: zip
BuildRequires: zlib-devel
BuildRequires: perl-interpreter
# provides /usr/share/doc/HTML/en-US/index.html used as STARTFILE on RHEL
%if 0%{?rhel}
@ -57,11 +56,9 @@ exits quickly and swiftly displays web pages.
%patch3 -p1
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
perl -pi -e "s,^HELPFILE:.*,HELPFILE:file://localhost%{_pkgdocdir}/lynx_help/lynx_help_main.html,g" lynx.cfg
perl -pi -e "s,^DEFAULT_INDEX_FILE:.*,DEFAULT_INDEX_FILE:http://www.google.com/,g" lynx.cfg
perl -pi -e 's,^#LOCALE_CHARSET:.*,LOCALE_CHARSET:TRUE,' lynx.cfg
sed -e "s,^HELPFILE:.*,HELPFILE:file://localhost%{_pkgdocdir}/lynx_help/lynx_help_main.html,g" -i lynx.cfg
%if 0%{?rhel}
perl -pi -e 's,^STARTFILE:.*,STARTFILE:file:/usr/share/doc/HTML/en-US/index.html,' lynx.cfg
sed -e 's,^STARTFILE:.*,STARTFILE:file:/usr/share/doc/HTML/en-US/index.html,' -i lynx.cfg
%endif
%build
@ -108,8 +105,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
# Install Lang dependent resources
mkdir -p $RPM_BUILD_ROOT/usr/share/locale/ja/LC_MESSAGES/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Internet
cat >$RPM_BUILD_ROOT%{_sysconfdir}/lynx-site.cfg <<EOF
# Place any local lynx configuration options (proxies etc.) here.
EOF
@ -127,6 +122,7 @@ EOF
%changelog
* Tue Jul 25 2017 Kamil Dudka <kdudka@redhat.com> - 2.8.9-0.17.dev16
- do not depend on perl
- update upstream project URL
- update to the latest upstream pre-release