diff --git a/.gitignore b/.gitignore index 80a76d8..3e49565 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -urlview-0.9.tar.gz +/urlview-20121210git6cfcad.tar.xz diff --git a/sources b/sources index 3a39411..1b3da6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -67731f73e69297ffd106b65c8aebb2ab urlview-0.9.tar.gz +641e290fee364c4c9e63cad4966f5f46 urlview-20121210git6cfcad.tar.xz diff --git a/urlview-0.9-build.diff b/urlview-0.9-build.diff deleted file mode 100644 index 3f907fe..0000000 --- a/urlview-0.9-build.diff +++ /dev/null @@ -1,60 +0,0 @@ -diff -u urlview-0.9.old/enter.c urlview-0.9/enter.c ---- urlview-0.9.old/enter.c Tue Jul 4 12:14:30 2000 -+++ urlview-0.9/enter.c Tue Jul 4 14:48:40 2000 -@@ -141,7 +141,9 @@ - int pass = (flags == M_PASS); - int first = 1; - int j; -+#ifndef URLVIEW - char tempbuf[_POSIX_PATH_MAX] = ""; -+#endif - - FOREVER - { -diff -u urlview-0.9.old/urlview.c urlview-0.9/urlview.c ---- urlview-0.9.old/urlview.c Tue Jul 4 12:14:30 2000 -+++ urlview-0.9/urlview.c Tue Jul 4 14:45:50 2000 -@@ -46,6 +46,8 @@ - #include - #endif - -+#define ISSPACE(c) isspace((unsigned char)c) -+ - #define DEFAULT_REGEXP "(((https?|ftp|gopher)://|(mailto|file|news):)[^' \t<>\"]+|(www|web|w3)\\.[-a-z0-9.]+)[^' \t.,;<>\"\\):]" - #define DEFAULT_COMMAND "url_handler.sh %s" - #define SYSTEM_INITFILE "/etc/urlview.conf" -@@ -64,6 +66,8 @@ - extern int mutt_enter_string (unsigned char *buf, size_t buflen, int y, int x, - int flags); - -+extern char *quote (char *d, size_t l, const char *f); -+ - void search_forward (char *search, int urlcount, char **url, int *redraw, int *current, int *top) - { - regex_t rx; -@@ -198,10 +202,10 @@ - { - if (buf[0] == '#' || buf[0] == '\n') - continue; -- if (strncmp ("REGEXP", buf, 6) == 0 && isspace (buf[6])) -+ if (strncmp ("REGEXP", buf, 6) == 0 && ISSPACE (buf[6])) - { - pc = buf + 6; -- while (isspace (*pc)) -+ while (ISSPACE (*pc)) - pc++; - wc = regexp; - while (*pc && *pc != '\n') -@@ -235,10 +239,10 @@ - } - *wc = 0; - } -- else if (strncmp ("COMMAND", buf, 7) == 0 && isspace (buf[7])) -+ else if (strncmp ("COMMAND", buf, 7) == 0 && ISSPACE (buf[7])) - { - pc = buf + 7; -- while (isspace (*pc)) -+ while (ISSPACE (*pc)) - pc++; - pc[ strlen (pc) - 1 ] = 0; /* kill the trailing newline */ - strncpy (command, pc, sizeof (command) - 1); diff --git a/urlview-0.9-default.patch b/urlview-0.9-default.patch deleted file mode 100644 index 6ca4dd2..0000000 --- a/urlview-0.9-default.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- urlview-0.9/url_handler.sh.default 2000-07-04 12:14:30.000000000 +0200 -+++ urlview-0.9/url_handler.sh 2007-06-27 17:21:31.000000000 +0200 -@@ -28,15 +28,15 @@ - # VT: Launch in the same terminal - - # The lists of programs to be executed are --https_prgs="/usr/X11R6/bin/netscape:XW /usr/bin/lynx:XT" --http_prgs="/usr/bin/lynx:XT /usr/X11R6/bin/netscape:XW" -+https_prgs="/usr/bin/htmlview:XW /usr/bin/firefox:XW /usr/bin/seamonkey:XW /usr/bin/konqueror:XW /usr/bin/epiphany:XW /usr/bin/links:XT /usr/bin/lynx:XT" -+http_prgs="/usr/bin/htmlview:XW /usr/bin/firefox:XW /usr/bin/seamonkey:XW /usr/bin/konqueror:XW /usr/bin/epiphany:XW /usr/bin/links:XT /usr/bin/lynx:XT" - mailto_prgs="/usr/bin/mutt:VT /usr/bin/elm:VT /usr/bin/pine:VT /usr/bin/mail:VT" --gopher_prgs="/usr/bin/lynx:XT /usr/bin/gopher:XT" --ftp_prgs="/usr/bin/lynx:XT /usr/bin/ncftp:XT" -+gopher_prgs="/usr/bin/lynx:XT" -+ftp_prgs="/usr/bin/ncftp:XT /usr/bin/wget:XT /usr/bin/lynx:XT" - - # Program used as an xterm (if it doesn't support -T you'll need to change - # the command line in getprg) --XTERM=/usr/X11R6/bin/xterm -+XTERM=/usr/bin/xterm - - - ########################################################################### -@@ -100,9 +100,7 @@ gopher) - prg=`getprg $gopher_prgs` - ;; - *) -- echo "Unknown URL type. Please report URL and viewer to:" -- echo "joey@debian.org." -- echo -n "Press enter to continue."; read x -+ echo -n "Unknown URL type. Press enter to continue."; read x - exit - ;; - esac diff --git a/urlview-default.patch b/urlview-default.patch new file mode 100644 index 0000000..98e7c79 --- /dev/null +++ b/urlview-default.patch @@ -0,0 +1,62 @@ +diff -up urlview/.default urlview/ +diff -up urlview/url_handler.sh.default urlview/url_handler.sh +--- urlview/url_handler.sh.default 2012-12-10 16:27:10.000000000 +0100 ++++ urlview/url_handler.sh 2012-12-14 15:22:11.658278857 +0100 +@@ -28,15 +28,15 @@ + # VT: Launch in the same terminal + + # The lists of programs to be executed are +-https_prgs="/usr/X11R6/bin/netscape:XW /usr/bin/lynx:XT" +-http_prgs="/usr/bin/lynx:XT /usr/X11R6/bin/netscape:XW" ++https_prgs="/usr/bin/htmlview:XW /usr/bin/firefox:XW /usr/bin/seamonkey:XW /usr/bin/konqueror:XW /usr/bin/epiphany:XW /usr/bin/links:XT /usr/bin/lynx:XT" ++http_prgs="/usr/bin/htmlview:XW /usr/bin/firefox:XW /usr/bin/seamonkey:XW /usr/bin/konqueror:XW /usr/bin/epiphany:XW /usr/bin/links:XT /usr/bin/lynx:XT" + mailto_prgs="/usr/bin/mutt:VT /usr/bin/elm:VT /usr/bin/pine:VT /usr/bin/mail:VT" +-gopher_prgs="/usr/bin/lynx:XT /usr/bin/gopher:XT" +-ftp_prgs="/usr/bin/lynx:XT /usr/bin/ncftp:XT" ++gopher_prgs="/usr/bin/lynx:XT" ++ftp_prgs="/usr/bin/ncftp:XT /usr/bin/wget:XT /usr/bin/lynx:XT" + + # Program used as an xterm (if it doesn't support -T you'll need to change + # the command line in getprg) +-XTERM=/usr/X11R6/bin/xterm ++XTERM=/usr/bin/xterm + + + ########################################################################### +@@ -100,9 +100,7 @@ gopher) + prg=`getprg $gopher_prgs` + ;; + *) +- echo "Unknown URL type. Please report URL and viewer to:" +- echo "joey@debian.org." +- echo -n "Press enter to continue."; read x ++ echo -n "Unknown URL type. Press enter to continue."; read x + exit + ;; + esac +diff -up urlview/urlview.c.default urlview/urlview.c +--- urlview/urlview.c.default 2012-12-10 16:27:10.000000000 +0100 ++++ urlview/urlview.c 2012-12-14 15:37:35.082248774 +0100 +@@ -50,8 +50,8 @@ + #include "quote.h" + + #define DEFAULT_REGEXP "(((http|https|ftp|gopher)|mailto):(//)?[^ <>\"\t]*|(www|ftp)[0-9]?\\.[-a-z0-9.]+)[^ .,;\t\n\r<\">\\):]?[^, <>\"\t]*[^ .,;\t\n\r<\">\\):]" +-#define DEFAULT_COMMAND "/etc/urlview/url_handler.sh %s" +-#define SYSTEM_INITFILE "/etc/urlview/system.urlview" ++#define DEFAULT_COMMAND "/usr/bin/url_handler.sh %s" ++#define SYSTEM_INITFILE "/etc/urlview.conf" + + #define OFFSET 2 + #define PAGELEN (LINES - 1 - OFFSET) +diff -up urlview/urlview.conf.suse.default urlview/urlview.conf.suse +--- urlview/urlview.conf.suse.default 2012-12-10 16:27:10.000000000 +0100 ++++ urlview/urlview.conf.suse 2012-12-14 15:46:58.229840267 +0100 +@@ -4,6 +4,6 @@ + # + # The defaults are shown here: + # +-# REGEXP (((https?|ftp|gopher)://|(mailto|file|news):)[^' \t<>"]+|(www|web|w3)\.[-a-z0-9.]+)[^' \t.,;<>"\):] +-# COMMAND url_handler.sh '%s' ++# REGEXP (((http|https|ftp|gopher)|mailto):(//)?[^ <>\"\t]*|(www|ftp)[0-9]?\\.[-a-z0-9.]+)[^ .,;\t\n\r<\">\\):]?[^, <>\"\t]*[^ .,;\t\n\r<\">\\):] ++# COMMAND /usr/bin/url_handler.sh %s + # diff --git a/urlview.spec b/urlview.spec index 18edce0..6d9c223 100644 --- a/urlview.spec +++ b/urlview.spec @@ -1,12 +1,16 @@ +%global gitdate 20121210 +%global gitrev 6cfcad Name: urlview Version: 0.9 -Release: 10%{?dist} +Release: 10.%{gitdate}git%{gitrev}%{?dist} Summary: URL extractor/launcher Group: Applications/Internet License: GPLv2+ -URL: ftp://ftp.mutt.org/pub/mutt/contrib/urlview-0.9.README -Source0: ftp://ftp.mutt.org/pub/mutt/contrib/urlview-%{version}.tar.gz +URL: https://github.com/sigpipe/urlview +# git clone git://github.com/sigpipe/urlview.git; cd urlview +# git archive --prefix=urlview/ %{gitrev} | xz > urlview-%{gitdate}git%{gitrev}.tar.xz +Source0: %{name}-%{gitdate}git%{gitrev}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -14,8 +18,7 @@ BuildRequires: ncurses-devel # mutt packages before 5:1.5.16-2 included urlview Conflicts: mutt < 5:1.5.16-2 -Patch1: urlview-0.9-build.diff -Patch2: urlview-0.9-default.patch +Patch1: urlview-default.patch %description urlview is a screen oriented program for extracting URLs from text @@ -23,9 +26,8 @@ files and displaying a menu from which you may launch a command to view a specific item. %prep -%setup -q -%patch1 -p1 -b .build -%patch2 -p1 -b .default +%setup -q -n %{name} +%patch1 -p1 -b .default %build %configure