From bad8845e891bdeb98691382a3cee945db521472b Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Mon, 9 Jul 2007 17:24:04 +0000 Subject: [PATCH 1/4] Initialize branch F-7 for urlview --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From e8c4038aeaad7557ed6adf1ac5219d3883a2da7f Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 10 Jul 2007 10:23:11 +0000 Subject: [PATCH 2/4] - initial release --- .cvsignore | 1 + sources | 1 + urlview-0.9-build.diff | 60 +++++++++++++++++++++++++++++++++++++++ urlview-0.9-default.patch | 34 ++++++++++++++++++++++ urlview.spec | 57 +++++++++++++++++++++++++++++++++++++ 5 files changed, 153 insertions(+) create mode 100644 urlview-0.9-build.diff create mode 100644 urlview-0.9-default.patch create mode 100644 urlview.spec diff --git a/.cvsignore b/.cvsignore index e69de29..80a76d8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +urlview-0.9.tar.gz diff --git a/sources b/sources index e69de29..3a39411 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +67731f73e69297ffd106b65c8aebb2ab urlview-0.9.tar.gz diff --git a/urlview-0.9-build.diff b/urlview-0.9-build.diff new file mode 100644 index 0000000..3f907fe --- /dev/null +++ b/urlview-0.9-build.diff @@ -0,0 +1,60 @@ +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 new file mode 100644 index 0000000..6ca4dd2 --- /dev/null +++ b/urlview-0.9-default.patch @@ -0,0 +1,34 @@ +--- 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.spec b/urlview.spec new file mode 100644 index 0000000..f55aa44 --- /dev/null +++ b/urlview.spec @@ -0,0 +1,57 @@ +Name: urlview +Version: 0.9 +Release: 2%{?dist} +Summary: URL extractor/launcher + +Group: Applications/Internet +License: GPL +URL: ftp://ftp.mutt.org/pub/mutt/contrib/urlview-0.9.README +Source0: ftp://ftp.mutt.org/pub/mutt/contrib/urlview-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +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 + +%description +urlview is a screen oriented program for extracting URLs from text +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 + +%build +%configure +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_mandir}/man1} +install -p -m644 urlview.conf.suse $RPM_BUILD_ROOT%{_sysconfdir}/urlview.conf +install -p urlview url_handler.sh $RPM_BUILD_ROOT%{_bindir} +install -p -m644 urlview.man $RPM_BUILD_ROOT%{_mandir}/man1/urlview.1 + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING README sample.urlview +%config(noreplace) %{_sysconfdir}/urlview.conf +%{_bindir}/urlview +%{_bindir}/url_handler.sh +%{_mandir}/man1/urlview.1* + +%changelog +* Fri Jun 29 2007 Miroslav Lichvar 0.9-2 +- add conflict with mutt, fix URL (#245951) + +* Wed Jun 27 2007 Miroslav Lichvar 0.9-1 +- split from mutt package From e693acfb72bddfbbf97589043ca191adec58a158 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:16:06 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 62f9f83..ded02f9 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := urlview SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From b0e211e41ecc1aef2cc0444571d2b917d71749ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:47:15 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ded02f9..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: urlview -# $Id$ -NAME := urlview -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7