- split urlview off, fix requires and description (#226167)

.cvsignore

@@ -1,2 +1 @@
-urlview-0.9.tar.gz
 mutt-1.5.16.tar.gz

mutt.spec

@@ -1,42 +1,37 @@
 Summary: A text mode mail user agent
 Name: mutt
 Version: 1.5.16
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 5
 License: GPL
 Group: Applications/Internet
 Source: ftp://ftp.mutt.org/pub/mutt/devel/mutt-%{version}.tar.gz
-%define uversion 0.9
-Source2: ftp://ftp.mutt.org/pub/mutt/contrib/urlview-%{uversion}.tar.gz
 Source1: mutt_ldap_query
 Patch2: mutt-1.5.13-nodotlock.patch
 Patch3: mutt-1.5.16-muttrc.patch
 Patch4: mutt-1.5.16-manual.patch
-Patch5: urlview-0.9-default.patch
-Patch6: urlview.diff
 Url: http://www.mutt.org/
-Requires: /usr/sbin/sendmail webclient mailcap
+Requires: mailcap urlview
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: /usr/sbin/sendmail
 BuildRequires: cyrus-sasl-devel db4-devel gnutls-devel krb5-devel ncurses-devel
-BuildRequires: libidn-devel gettext docbook-style-xsl libxslt lynx
+BuildRequires: libidn-devel gettext
+# required to build documentation
+BuildRequires: docbook-style-xsl libxslt lynx
 
 %description
-Mutt is a text-mode mail user agent. Mutt supports color, threading,
+Mutt is a small but very powerful text-based MIME mail client.  Mutt
-arbitrary key remapping, and a lot of customization.
+is highly configurable, and is well suited to the mail power user with
-
+advanced features like key bindings, keyboard macros, mail threading,
-You should install mutt if you have used it in the past and you prefer
+regular expression searches and a powerful pattern matching language
-it, or if you are new to mail programs and have not decided which one
+for selecting groups of messages.
-you are going to use.
 
 %prep
-%setup -q -a 2
+%setup -q
 # Thou shalt use fcntl, and only fcntl
 %patch2 -p1 -b .nodl
 %patch3 -p1 -b .muttrc
 %patch4 -p1 -b .manual
-%patch5 -p0 -b .default
-%patch6 -p0 -b .build
 
 install -p -m644 %{SOURCE1} mutt_ldap_query
 
@@ -53,10 +48,6 @@ install -p -m644 %{SOURCE1} mutt_ldap_query
 	--with-docdir=%{_docdir}/%{name}-%{version}
 make %{?_smp_mflags}
 
-cd urlview-%{uversion}
-%configure
-make %{?_smp_mflags}
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -78,14 +69,6 @@ EOF
 
 echo "# Local configuration for Mutt." > $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.local
 
-cd urlview-%{uversion}
-install urlview url_handler.sh $RPM_BUILD_ROOT%{_bindir}
-install -p -m 644 urlview.man $RPM_BUILD_ROOT%{_mandir}/man1/urlview.1
-mkdir -p doc/urlview
-cp -p AUTHORS ChangeLog COPYING README sample.urlview \
-  doc/urlview
-cd ..
-
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/{*.dist,mime.types}
 rm -f $RPM_BUILD_ROOT%{_bindir}/{flea,muttbug}
@@ -104,18 +87,17 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYRIGHT ChangeLog GPL NEWS README* UPDATING mutt_ldap_query
 %doc contrib/*.rc contrib/sample.* contrib/ca-bundle.crt contrib/colors.*
 %doc doc/manual.txt doc/smime-notes.txt
-%doc urlview-%{uversion}/doc/urlview
 %{_bindir}/mutt
 %{_bindir}/pgpring
 %{_bindir}/pgpewrap
 %{_bindir}/smime_keys
-%{_bindir}/urlview
-%{_bindir}/url_handler.sh
-%{_mandir}/man1/urlview.*
 %{_mandir}/man1/mutt.*
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Wed Jul 11 2007 Miroslav Lichvar <mlichvar@redhat.com> 5:1.5.16-2
+- split urlview off, fix requires and description (#226167)
+
 * Mon Jun 11 2007 Miroslav Lichvar <mlichvar@redhat.com> 5:1.5.16-1
 - update to 1.5.16
 

sources

@@ -1,2 +1 @@
-67731f73e69297ffd106b65c8aebb2ab  urlview-0.9.tar.gz
 10eff7024dbb7ce1f773d688a69ea9db  mutt-1.5.16.tar.gz

urlview-0.9-default.patch

@@ -1,18 +0,0 @@
---- urlview-0.9/url_handler.sh.default	Tue Jul  4 06:14:30 2000
-+++ urlview-0.9/url_handler.sh	Tue Jul  4 13:02:40 2000
-@@ -28,11 +28,11 @@
- # 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/mozilla:XW /usr/bin/links:XT /usr/bin/lynx:XT"
-+http_prgs="/usr/bin/htmlview:XW /usr/bin/mozilla: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)

urlview.diff

@@ -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 <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);