- merged from DEVEL (updated to 0.4pre7)

Changed files:
    elinks-configure.patch -> 1.2
    elinks-lua-scripts-fixes.patch -> 1.2
    elinks.desktop -> 1.3
    elinks.spec -> 1.18

diff --git a/elinks-configure.patch b/elinks-configure.patch
index 10dcfe7eb6bca1a7f01473695c1978b3764e8514..d1cd6c086cc8c3db4aac77b5c8f8aaeaa153f615 100644 (file)
--- a/elinks-configure.patch
+++ b/elinks-configure.patch
@@ -1,12 +1,11 @@
-diff -urN elinks-20020208/configure.in aaa/elinks-20020208/configure.in
---- elinks-20020208/configure.in       Thu Jan 17 21:58:00 2002
-+++ aaa/elinks-20020208/configure.in   Sun Feb 10 22:52:30 2002
-@@ -138,7 +138,7 @@
+--- elinks-0.4pre7/configure.in.x      Sat May 11 22:25:38 2002
++++ elinks-0.4pre7/configure.in        Sat May 11 22:23:55 2002
+@@ -227,7 +227,7 @@
        for luadir in "" /usr /usr/local; do
                if test "$cf_result" = no; then
                        if test ! -z "$luadir"; then
 -                              LIBS="-L$luadir/lib -llua -llualib -lm $LIBS_X"
 +                              LIBS="-L$luadir/lib -llua -llualib -lm -ldl $LIBS_X"
-                               CFLAGS="$CFLAGS_X -I$luadir/include"
+                               CFLAGS="$CFLAGS_X -I$luadir/include -I$luadir/include/lua"
                        else
                                LIBS="-llua -llualib -lm $LIBS_X"

diff --git a/elinks-lua-scripts-fixes.patch b/elinks-lua-scripts-fixes.patch
new file mode 100644 (file)
index 0000000..d53b79a
--- /dev/null
+++ b/elinks-lua-scripts-fixes.patch
@@ -0,0 +1,12 @@
+diff -urN aaa/elinks-0.4pre10/contrib/lua/hooks.lua.in elinks-0.4pre10/contrib/lua/hooks.lua.in
+--- aaa/elinks-0.4pre10/contrib/lua/hooks.lua.in       Wed Jul  3 00:38:05 2002
++++ elinks-0.4pre10/contrib/lua/hooks.lua.in   Thu Jul  4 13:07:55 2002
+@@ -9,7 +9,7 @@
+ --  Load configuration
+ ----------------------------------------------------------------------
+ 
+-home_dir = (getenv and getenv ("HOME")) or "/home/"..getenv("USER")
++home_dir = (getenv and getenv ("HOME")) or (getenv and "/home/"..getenv("USER"))
+ dofile ("@sysconfdir@/config.lua")
+ dofile (home_dir.."/.elinks/config.lua")
+ 

diff --git a/elinks.desktop b/elinks.desktop
index 36c56814b226d3e84d3d67ecc3dcb8c9c8badc0e..3837296719ec1b9458f99b74b2c8b2d31ec020b4 100644 (file)
--- a/elinks.desktop
+++ b/elinks.desktop
@@ -4,5 +4,6 @@ Comment=Experimental Links www text browser
 Comment[pl]=Eksperymentalna wersja tekstowej przeglądarki WWW Links 
 Exec=elinks
 Terminal=1
+Icon=elinks.png
 Type=Application
 # vi: encoding=utf-8

diff --git a/elinks.spec b/elinks.spec
index f54b41838cc08aca7a213248f222bb789ea69a7d..3e49c6bde3c72e3abd1f7336bc83516416965477 100644 (file)
--- a/elinks.spec
+++ b/elinks.spec
@@ -1,24 +1,24 @@
 Summary:       Experimantal Links (text WWW browser)
 Summary(pl):   Eksperymentalny Links (tekstowa przegl±darka WWW)
 Name:          elinks
-Version:       0.3.2
+Version:       0.4pre12
 Release:       2
 License:       GPL
 Group:         Applications/Networking
 Source0:       http://elinks.pld.org.pl/download/%{name}-%{version}.tar.bz2
 Source1:       %{name}.desktop
-Source2:       %{name}-bm.lua
-Source3:       %{name}-hooks.lua
-Source4:       links.png
+Source2:       links.png
 Patch0:                %{name}-configure.patch
-Patch1:                %{name}-lua-config-file.patch
+Patch1:                %{name}-lua-scripts-fixes.patch
 URL:           http://elinks.pld.org.pl/
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: bzip2-devel
 BuildRequires: gpm-devel
 BuildRequires: lua-devel
 BuildRequires: ncurses-devel => 5.1
 BuildRequires: openssl-devel >= 0.9.6a
+BuildRequires: zlib-devel
 Provides:      webclient
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -48,28 +48,27 @@ aclocal
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_applnkdir}/Network/WWW,%{_pixmapsdir}} \
-       $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sysconfdir}}
+install -d $RPM_BUILD_ROOT%{_applnkdir}/Network/WWW \
+  $RPM_BUILD_ROOT%{_datadir}/%{name} \
+  $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_pixmapsdir}}
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-mv -f $RPM_BUILD_ROOT%{_bindir}/links          $RPM_BUILD_ROOT%{_bindir}/%{name}
-mv -f $RPM_BUILD_ROOT%{_mandir}/man1/links.1   $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
-
 install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Network/WWW
-install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}
-install %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+
+install contrib/lua/config.lua $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS BUGS ChangeLog HACKING README SITES TODO
+%doc AUTHORS BUGS ChangeLog HACKING LUA NEWS README SITES TODO
+%doc contrib/{completion.tcsh,keybind*,wipe-out-ssl*,lua/{*.lua,elinks-remote}}
+%doc contrib/conv/{*awk,*.pl,*.sh}
 %attr(755,root,root) %{_bindir}/*
 %{_applnkdir}/Network/WWW/*
 %{_mandir}/man*/*
-%{_datadir}/%{name}/*
-%config(noreplace) %{_sysconfdir}/elinks-hooks.lua
 %{_pixmapsdir}/*
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}