rpms/uudeview/devel uudeview-debian-patches.patch, NONE, 1.1 uudeview.spec, 1.16, 1.17

[Adrian Reber (adrian)]

Author: adrian

Update of /cvs/extras/rpms/uudeview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2016

Modified Files:
	uudeview.spec 
Added Files:
	uudeview-debian-patches.patch 
Log Message:
* Thu Jan 03 2008 Adrian Reber <adrian at lisas.de> - 0.5.20-14
- rebuilt for tcl-8.5
- added patch from debian
- changed BR from tetex-latex to texlive-latex


uudeview-debian-patches.patch:

--- NEW FILE uudeview-debian-patches.patch ---
--- uudeview-0.5.20.orig/man/uudeview.1
+++ uudeview-0.5.20/man/uudeview.1
@@ -164,6 +164,16 @@
 verbosity. Normally, the program prints some status messages
 while reading the input files, which can be very helpful if something
 should go wrong. Use if these messages disturb you.
+Disables progress bars. See
+.B -n
+option.
+.TP
+.B -v
+(disables Verbosity) Disables verbose messages, i.e. notes are not
+displayed, but does not remove warnings and errors. Is not as quiet as
+the
+.B -q
+(Quiet) option.
 .TP
 .B -n
 No progress bars. Normally, UUDeview prints ASCII bars crawling up
--- uudeview-0.5.20.orig/tcl/xdeview
+++ uudeview-0.5.20/tcl/xdeview
@@ -59,8 +59,8 @@
 # MIME configuration
 #
 
-ifndef MIMEGlobalTypes	""
-ifndef MIMEGlobalCap	""
+ifndef MIMEGlobalTypes	"/etc/mime.types"
+ifndef MIMEGlobalCap	"/etc/mailcap"
 if { ! [ catch { set env(HOME) } ] } {
     ifndef MIMELocalTypes	$env(HOME)/.mime.types
     ifndef MIMELocalCap		$env(HOME)/.mailcap
--- uudeview-0.5.20.orig/unix/uudeview.c
+++ uudeview-0.5.20/unix/uudeview.c
@@ -454,7 +454,7 @@
     return 0;
   }
 
-  if ((target = fopen (stdfile, "wb")) == NULL) {
+  if ((target = fopen (stdfile, "wbx")) == NULL) {
     fprintf (stderr, "proc_stdin: cannot open temp file %s for writing: %s\n",
 	     stdfile, strerror (errno));
     _FP_free (stdfile);
@@ -657,9 +657,6 @@
     else switch (*(argv[number] + 1)) {
     case '\0':
       interact = 0;
-      if (overwrite == 0) {
-	overwrite = 1;
-      }
       proc_stdin ();
       break;
     case 'a':
@@ -699,10 +696,7 @@
 	fprintf (stderr, "WARNING: cannot interact when reading from stdin\n");
       }
       else {
-	interact  = (*argv[number] == '+') ? 1 : 0;
-	if (overwrite == 0 && *argv[number] == '-') {
-	  overwrite = 1;
-	}
+	interact = (*argv[number] == '+') ? 1 : 0;
       }
       break;
     case 'm':
@@ -773,6 +767,8 @@
       break;
     }
   }
+  if (overwrite == 0 && interact == 0 && autoren == 0)
+    overwrite = 1;
 
   return 1;
 }
--- uudeview-0.5.20.orig/uulib/uulib.c
+++ uudeview-0.5.20/uulib/uulib.c
@@ -872,7 +872,10 @@
 }
 
 /*
- * decode file first to temp file, then copy it to a final location
+ * Decode file first to temp file, then copy it to a final location.
+ * A move is preferable to a copy.  If the file is on the same
+ * partition, no copy is performed.  This is important for large
+ * files.
  */
 
 int UUEXPORT
@@ -978,6 +981,12 @@
     return UURET_IOERR;
   }
 
+  if (rename(thefile->binfile, uugen_fnbuffer) == 0) {
+    fclose(source);
+    close(fildes);
+    goto finish_ok;
+  }
+
   if ((target = fdopen (fildes, "wb")) == NULL) {
     progress.action = 0;
     UUMessage (uulib_id, __LINE__, UUMSG_ERROR,
@@ -1042,6 +1051,8 @@
 	       thefile->binfile,
 	       strerror (uu_errno = errno));
   }
+
+ finish_ok:
   _FP_free (thefile->binfile);
   thefile->binfile = NULL;
   thefile->state  &= ~UUFILE_TMPFILE;
--- uudeview-0.5.20.orig/uulib/uunconc.c
+++ uudeview-0.5.20/uulib/uunconc.c
@@ -1325,9 +1325,9 @@
     return UURET_NODATA;
 
   if (data->uudet == PT_ENCODED)
-    mode = "wt";	/* open text files in text mode */
+    mode = "wtx";	/* open text files in text mode */
   else
-    mode = "wb";	/* otherwise in binary          */
+    mode = "wbx";	/* otherwise in binary          */
 
   if ((data->binfile = tempnam (NULL, "uu")) == NULL) {
     UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
@@ -1437,6 +1437,9 @@
 	res = UURET_IOERR;
 	break;
       }
+      UUMessage (uunconc_id, __LINE__, UUMSG_MESSAGE,
+		 uustring (S_OPEN_FILE),
+		 iter->data->sfname);
       _FP_strncpy (uugen_fnbuffer, iter->data->sfname, 1024);
     }
 
@@ -1502,7 +1505,7 @@
       progress.action = 0;
       return UURET_NOMEM;
     }
-    if ((datain = fopen (data->binfile, "rb")) == NULL) {
+    if ((datain = fopen (data->binfile, "rbx")) == NULL) {
       UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
 		 uustring (S_NOT_OPEN_FILE),
 		 data->binfile, strerror (uu_errno = errno));
--- uudeview-0.5.20.orig/uulib/uuscan.c
+++ uudeview-0.5.20/uulib/uuscan.c
@@ -387,10 +387,10 @@
 	   *attribute != '(' && *attribute != ')' &&
 	   *attribute != '<' && *attribute != '>' &&
 	   *attribute != '@' && *attribute != ',' &&
-	   /* *attribute != ';' && */ *attribute != ':' &&
-	   *attribute != '\\' &&*attribute != '"' &&
-	   *attribute != '/' && /* *attribute != '[' &&
-	   *attribute != ']' && */ *attribute != '?' &&
+	   *attribute != ';' && *attribute != ':' &&
+	   *attribute != '\\' && *attribute != '"' &&
+	   *attribute != '/' && *attribute != '[' &&
+	   *attribute != ']' && *attribute != '?' &&
 	   *attribute != '=' && length < 255) {
       *ptr++ = *attribute++;
       length++;
--- uudeview-0.5.20.orig/uulib/uustring.c
+++ uudeview-0.5.20/uulib/uustring.c
@@ -107,6 +107,7 @@
   { S_MIME_B_NOT_FOUND, "Boundary expected on Multipart message but found EOF" },
   { S_MIME_MULTI_DEPTH, "Multipart message nested too deep" },
   { S_MIME_PART_MULTI,  "Handling partial multipart message as plain text" },
+  { S_OPEN_FILE,        "Opened file %s" },
 
   { 0, "" }
 };
--- uudeview-0.5.20.orig/uulib/uustring.h
+++ uudeview-0.5.20/uulib/uustring.h
@@ -36,3 +36,4 @@
 #define S_MIME_B_NOT_FOUND    35
 #define S_MIME_MULTI_DEPTH    36
 #define S_MIME_PART_MULTI     37
+#define S_OPEN_FILE           38
--- uudeview-0.5.20.orig/man/uuwish.1
+++ uudeview-0.5.20/man/uuwish.1
@@ -0,0 +1,45 @@
+.\" Copyright (c) 1999  Roland Rosenfeld <roland at spinnaker.de>
+.\" changes Copyright (c) 2001  Chris Hanson <cph at debian.org>
+.\"               
+.\" This program is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\" 
+.\" This program is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\" 
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program; if not, write to the Free Software
+.\" Foundation, Inc.,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+.\"
+.\" This manual page is written especially for Debian Linux.
+.\"
+.TH UUWISH 1 "February 2001" "Debian Project" "Debian GNU/Linux"
+.SH NAME
+uuwish \- A minimal wish extended by the UU commands
+.SH SYNOPSIS
+.B uuwish
+is a minimal
+.BR wish (1)
+extended by the UU commands that are available in
+.BR uudeview (1)
+and
+.BR uuenview (1).
+.B uuwish
+isn't meant to be called directly; it is a Tcl/Tk script interpreter,
+which is meant to be used by
+.BR xdeview (1).
+.SH "SEE ALSO"
+.BR xdeview (1),
+.BR uudeview (1),
+.BR uuenview (1),
+.BR wish (1).
+.SH AUTHOR
+.B uuwish
+was written by Frank Pilhofer <fp at informatik.uni-frankfurt.de>.
+.PP
+This manual page was written by Roland Rosenfeld <roland at debian.org>,
+for the Debian GNU/Linux system (but may be used by others).


Index: uudeview.spec
===================================================================
RCS file: /cvs/extras/rpms/uudeview/devel/uudeview.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- uudeview.spec	11 Oct 2007 17:32:37 -0000	1.16
+++ uudeview.spec	3 Jan 2008 21:08:09 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           uudeview
 Version:        0.5.20
-Release:        13
+Release:        14
 
 License:        GPLv2+
 Group:          Applications/File
@@ -8,11 +8,12 @@
 Source1:        xdeview.desktop
 Patch0:         uudeview-tempname.patch
 Patch1:         http://nget.sourceforge.net/patches/uulib-0.5.19-uuinfofile-long-headers.patch
+Patch2:         uudeview-debian-patches.patch
 URL:            http://www.fpx.de/fp/Software/UUDeview/
 Summary:        Applications for uuencoding, uudecoding, ...
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  inews, tcl, tk
-BuildRequires:  tetex-latex, transfig, desktop-file-utils
+BuildRequires:  texlive-latex, transfig, desktop-file-utils
 BuildRequires:  %{_includedir}/tcl.h, %{_includedir}/tk.h
 Requires:       %{_sbindir}/sendmail
 
@@ -42,6 +43,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 %{__sed} -i -e "s,psfig,epsfig,g" doc/library.ltx
 %{__sed} -i -e "s,for ff_subdir in lib,for ff_subdir in %{_lib},g" configure
 
@@ -54,6 +56,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+sed -i -e "s,xdeview.1,xdeview.1 uuwish.1,g" Makefile
 make install BINDIR=$RPM_BUILD_ROOT/%{_bindir} MANDIR=$RPM_BUILD_ROOT/%{_mandir}
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -87,6 +90,11 @@
 %{_libdir}/*.a
 
 %changelog
+* Thu Jan 03 2008 Adrian Reber <adrian at lisas.de> - 0.5.20-14
+- rebuilt for tcl-8.5
+- added patch from debian
+- changed BR from tetex-latex to texlive-latex
+
 * Thu Oct 11 2007 Adrian Reber <adrian at lisas.de> - 0.5.20-13
 - rebuilt for BuildID
 - updated license tag