auto-import changelog data from mutt-1.2.5i-16.src.rpm

Sat Jul 21 2001 Tim Powers <timp@redhat.com> - no more applnk entries, it's cluttering our menus Fri Jul 20 2001 Bill Nottingham <notting@redhat.com> - add slang-devel to buildprereqs (#49531) Mon Jun 11 2001 Bill Nottingham <notting@redhat.com> - add some sample color definitions (#19471) Thu May 24 2001 Bill Nottingham <notting@redhat.com> - fix typo in muttrc.man (#41610)
2004-09-09 08:54:32 +00:00 · 2004-09-09 08:54:32 +00:00 · fbd586ba5c
commit fbd586ba5c
parent 94e2da8825
5 changed files with 139 additions and 12 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +1,2 @@
 mutt-1.2.5i.tar.gz
+urlview-0.9.tar.gz
--- a/mutt.spec
+++ b/mutt.spec
@ -1,21 +1,29 @@
 Summary: A text mode mail user agent.
 Name: mutt
 %define pversion 1.2.5
+%define uversion 0.9
 Version: %{pversion}i
-Release: 10
+Release: 16
 Serial: 4
 Copyright: GPL
 Group: Applications/Internet
 Source: ftp://ftp.mutt.org/pub/mutt/mutt-%{pversion}i.tar.gz
+Source2: ftp://ftp.mutt.org/pub/mutt/contrib/urlview-%{uversion}.tar.gz
 Source1: mutt_ldap_query
+Source3: mutt-colors
 Patch0: mutt-nosetgid.patch
 Patch1: mutt-default.patch
 Patch4: mutt-md5.patch
 Patch5: mutt-1.2.5-imap.patch
-Patch6: mutt-1.2-hangul.patch
-Patch7: mutt-1.1-default.patch
+Patch6: mutt-1.2.5-muttbug-tmp.patch
+Patch7: mutt-1.2.5-gssapi-autoconf.patch
+Patch8: mutt-1.2.5i-man.patch
+Patch10: urlview-0.9-default.patch
+Patch11: urlview.diff
 Url: http://www.mutt.org/
-Requires: slang >= 0.99.38, smtpdaemon, urlview
+Requires: slang >= 0.99.38, smtpdaemon, webclient
+Obsoletes: urlview
+Provides: urlview
 Buildroot: %{_tmppath}/mutt-root
 Conflicts: mutt-us
 Provides: mutt-i
@ -23,7 +31,7 @@ Provides: mutt-i
 %{!?nossl:BuildPrereq: openssl-devel}
 %{!?nokerberos:Requires: krb5-libs}
 %{!?nokerberos:BuildPrereq: krb5-devel}
-BuildPrereq: /usr/sbin/sendmail
+BuildPrereq: /usr/sbin/sendmail slang-devel

 %description
 Mutt is a text mode mail user agent. Mutt supports color, threading,
@ -34,13 +42,16 @@ it, or if you're new to mail programs and you haven't decided which
 one you're going to use.

 %prep
-%setup -n mutt-%{pversion} -q
+%setup -n mutt-%{pversion} -q -a 2
 %patch0 -p1 -b .nosetgid
 %patch1 -p1 -b .default
 %patch4 -p1 -b .md5-argh
 %patch5 -p1 -b .imap
-%patch6 -p1 -b .hangul
-%patch7 -p1 -b .default1
+%patch6 -p1 -b .tmp
+%patch7 -p1 -b .auto
+%patch8 -p1 
+%patch10 -p0 -b .default
+%patch11 -p0 -b .build
 install -m644 %{SOURCE1} mutt_ldap_query

 %build
@ -56,6 +67,11 @@ CFLAGS="$RPM_OPT_FLAGS -g" ./prepare --prefix=%{_prefix} \
 	--disable-warnings --with-slang --disable-domain \
 	--disable-flock --enable-fcntl
 make
+
+cd urlview-%{uversion}
+%configure --with-slang
+make
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall sharedir=$RPM_BUILD_ROOT/etc \
@ -80,7 +96,8 @@ EOF
 # we like GPG here
 cat contrib/gpg.rc >> \
 	$RPM_BUILD_ROOT/etc/Muttrc
-
+grep -5 "^color" contrib/sample.muttrc >> \
+	$RPM_BUILD_ROOT/etc/Muttrc
 # and we use aspell

 cat >> $RPM_BUILD_ROOT/etc/Muttrc <<EOF
@ -89,6 +106,14 @@ set ispell="/usr/bin/aspell --mode=email check"

 EOF

+cd urlview-%{uversion}
+%makeinstall
+install -m 755 url_handler.sh $RPM_BUILD_ROOT%{_bindir}/url_handler.sh
+mkdir -p doc/urlview
+cp AUTHORS ChangeLog COPYING INSTALL README sample.urlview urlview.sgml \
+  doc/urlview
+cd ..
+
 %find_lang %{name}

 %clean
@ -97,20 +122,42 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root)
 %config /etc/Muttrc
-%config (missingok) /etc/X11/applnk/Internet/mutt.desktop
+#%config (missingok) /etc/X11/applnk/Internet/mutt.desktop
 %doc doc/*.txt
 %doc contrib/*.rc README* contrib/sample.* NEWS
 %doc COPYRIGHT doc/manual.txt contrib/language* mime.types mutt_ldap_query
+%doc urlview-%{uversion}/doc/urlview
 %{_bindir}/mutt
 %{_bindir}/muttbug
 %{_bindir}/pgpring
 %{_bindir}/pgpewrap
+%{_bindir}/urlview
+%{_bindir}/url_handler.sh
+%{_mandir}/man1/urlview.*
 %{_mandir}/man1/mutt.*
 %{_mandir}/man5/muttrc.*

 %changelog
-* Tue May 23 2001 Leon Ho <llch@redhat.com>
-Patched to support hangul (Korean)
+* Sat Jul 21 2001 Tim Powers <timp@redhat.com>
+- no more applnk entries, it's cluttering our menus
+
+* Fri Jul 20 2001 Bill Nottingham <notting@redhat.com>
+- add slang-devel to buildprereqs (#49531)
+
+* Mon Jun 11 2001 Bill Nottingham <notting@redhat.com>
+- add some sample color definitions (#19471)
+
+* Thu May 24 2001 Bill Nottingham <notting@redhat.com>
+- fix typo in muttrc.man (#41610)
+
+* Mon May 14 2001 Bill Nottingham <notting@redhat.com>
+- use mktemp in muttbug
+
+* Wed May  2 2001 Nalin Dahyabhai <nalin@redhat.com>
+- require webclient, not weclient
+
+* Wed May  2 2001 Bill Nottingham <notting@redhat.com>
+- build urlview here

 * Fri Mar  2 2001 Nalin Dahyabhai <nalin@redhat.com>
 - rebuild in new environment
--- a/1
+++ b/1
@ -1 +1,2 @@
 0ba5367059abdd55daceb82dce6be42f  mutt-1.2.5i.tar.gz
+67731f73e69297ffd106b65c8aebb2ab  urlview-0.9.tar.gz
--- a/urlview-0.9-default.patch
+++ b/urlview-0.9-default.patch
@ -0,0 +1,18 @@
+--- 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/netscape:XW /usr/bin/links:XT /usr/bin/lynx:XT"
+http_prgs="/usr/bin/netscape: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)
--- a/urlview.diff
+++ b/urlview.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 <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);