rpms/urlview/F-7 urlview-0.9-build.diff, NONE, 1.1 urlview-0.9-default.patch, NONE, 1.1 urlview.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Miroslav Lichvar (mlichvar) fedora-extras-commits at redhat.com
Tue Jul 10 10:23:45 UTC 2007


Author: mlichvar

Update of /cvs/pkgs/rpms/urlview/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13461

Modified Files:
	.cvsignore sources 
Added Files:
	urlview-0.9-build.diff urlview-0.9-default.patch urlview.spec 
Log Message:
- initial release


urlview-0.9-build.diff:

--- NEW FILE urlview-0.9-build.diff ---
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 <rx/rxposix.h>
 #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);

urlview-0.9-default.patch:

--- NEW FILE urlview-0.9-default.patch ---
--- 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 at debian.org."
-    echo -n "Press enter to continue."; read x
+    echo -n "Unknown URL type.  Press enter to continue."; read x
     exit
     ;;
 esac


--- NEW FILE urlview.spec ---
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 <mlichvar at redhat.com> 0.9-2
- add conflict with mutt, fix URL (#245951)

* Wed Jun 27 2007 Miroslav Lichvar <mlichvar at redhat.com> 0.9-1
- split from mutt package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/urlview/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jul 2007 17:23:57 -0000	1.1
+++ .cvsignore	10 Jul 2007 10:23:11 -0000	1.2
@@ -0,0 +1 @@
+urlview-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/urlview/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jul 2007 17:23:57 -0000	1.1
+++ sources	10 Jul 2007 10:23:11 -0000	1.2
@@ -0,0 +1 @@
+67731f73e69297ffd106b65c8aebb2ab  urlview-0.9.tar.gz




More information about the fedora-extras-commits mailing list