rpms/paps/devel paps-exitcode.patch, NONE, 1.1 paps-langinfo.patch, NONE, 1.1 paps.spec, 1.33, 1.34 paps-0.6.6-exitcode.patch, 1.1, NONE paps-0.6.6-langinfo.patch, 1.1, NONE

[Akira TAGOH]

Author: tagoh

Update of /cvs/pkgs/rpms/paps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29625

Modified Files:
	paps.spec 
Added Files:
	paps-exitcode.patch paps-langinfo.patch 
Removed Files:
	paps-0.6.6-exitcode.patch paps-0.6.6-langinfo.patch 
Log Message:
* Mon Sep  1 2008 Akira TAGOH <tagoh at redhat.com> - 0.6.8-7
- paps-langinfo.patch: Updated.
- paps-exitcode.patch: Updated.

paps-exitcode.patch:

--- NEW FILE paps-exitcode.patch ---
diff -pruN paps-0.6.8.orig/src/paps.c paps-0.6.8/src/paps.c
--- paps-0.6.8.orig/src/paps.c	2008-09-01 15:54:11.000000000 +0900
+++ paps-0.6.8/src/paps.c	2008-09-01 15:54:47.000000000 +0900
@@ -365,7 +365,7 @@ int main(int argc, char *argv[])
       if (!IN)
         {
           fprintf(stderr, "Failed to open %s!\n", filename_in);
-          exit(-1);
+          exit(1);
         }
     }
   else
@@ -499,7 +499,7 @@ int main(int argc, char *argv[])
       if (cvh == NULL)
         {
           fprintf(stderr, "%s: Invalid encoding: %s\n", g_get_prgname (), encoding);
-          exit(-1);
+          exit(1);
         }
     }
 
@@ -559,7 +559,7 @@ read_file (FILE   *file,
         {
           fprintf(stderr, "%s: Error reading file.\n", g_get_prgname ());
           g_string_free (inbuf, TRUE);
-          return NULL;
+          exit(1);
         }
       else if (bp == NULL)
         break;
@@ -573,7 +573,7 @@ read_file (FILE   *file,
           if (g_iconv (handle, &ib, &iblen, &ob, &oblen) == -1)
             {
               fprintf (stderr, "%s: Error while converting strings.\n", g_get_prgname ());
-              return NULL;
+              exit(1);
             }
           obuffer[BUFSIZE * 6 - 1 - oblen] = 0;
         }
@@ -637,7 +637,7 @@ split_text_into_paragraphs (PangoContext
 	      if (wtext == NULL)
 	        {
 		  fprintf (stderr, "Failed to convert UTF-8 to UCS-4.\n");
-		  return NULL;
+                  exit(1);
 		}
 
 	      len = g_utf8_strlen (para->text, para->length);
@@ -650,7 +650,7 @@ split_text_into_paragraphs (PangoContext
 		    {
 		      fprintf (stderr, "Failed to allocate a memory.\n");
 		      g_free (wtext);
-		      return NULL;
+                      exit(1);
 		    }
 		  for (i = 0; i < len; i++)
 		    {
@@ -665,7 +665,7 @@ split_text_into_paragraphs (PangoContext
 		  if (newtext == NULL)
 		    {
 		      fprintf (stderr, "Failed to convert UCS-4 to UTF-8.\n");
-		      return NULL;
+                      exit(1);
 		    }
 
 		  pango_layout_set_text (para->layout, newtext, -1);

paps-langinfo.patch:

--- NEW FILE paps-langinfo.patch ---
diff -pruN paps-0.6.8.orig/src/paps.c paps-0.6.8/src/paps.c
--- paps-0.6.8.orig/src/paps.c	2008-09-01 15:07:03.000000000 +0900
+++ paps-0.6.8/src/paps.c	2008-09-01 15:49:10.000000000 +0900
@@ -25,6 +25,7 @@
 #include <pango/pangoft2.h>
 #include "libpaps.h"
 #include <errno.h>
+#include <langinfo.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -331,6 +332,9 @@ int main(int argc, char *argv[])
   GIConv cvh = NULL;
   GOptionGroup *options;
 
+  /* Set locale from environment. */
+  setlocale(LC_ALL, "");
+
   /* Prerequisite when using glib. */
   g_type_init();
 
@@ -480,6 +484,15 @@ int main(int argc, char *argv[])
   page_layout.scale_x = page_layout.scale_y = 1.0;
       
 
+  if (encoding == NULL)
+    {
+      encoding = g_strdup(nl_langinfo(CODESET));
+      if (!strcmp(encoding, "UTF-8"))
+        {
+          g_free(encoding);
+          encoding = NULL;
+        }
+    }
   if (encoding != NULL)
     {
       cvh = g_iconv_open ("UTF-8", encoding);


Index: paps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paps/devel/paps.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- paps.spec	16 May 2008 11:45:01 -0000	1.33
+++ paps.spec	1 Sep 2008 08:49:37 -0000	1.34
@@ -1,6 +1,6 @@
 Name:		paps
 Version:	0.6.8
-Release:	6%{?dist}
+Release:	7%{?dist}
 
 License:	LGPLv2+
 URL:		http://paps.sourceforge.net/
@@ -12,11 +12,11 @@
 ## https://sourceforge.net/tracker/index.php?func=detail&aid=1832924&group_id=153049&atid=786241
 Patch1:		paps-0.6.8-wordwrap.patch
 ## https://sourceforge.net/tracker/index.php?func=detail&aid=1832926&group_id=153049&atid=786241
-Patch2:		paps-0.6.6-langinfo.patch
+Patch2:		paps-langinfo.patch
 ## https://sourceforge.net/tracker/index.php?func=detail&aid=1832929&group_id=153049&atid=786241
 Patch3:		paps-0.6.6-lcnumeric.patch
 ## https://sourceforge.net/tracker/index.php?func=detail&aid=1832935&group_id=153049&atid=786241
-Patch4:		paps-0.6.6-exitcode.patch
+Patch4:		paps-exitcode.patch
 Patch50:	paps-cups.patch
 Patch51:	paps-cpilpi.patch
 Patch52:	paps-dsc-compliant.patch
@@ -98,6 +98,10 @@
 %{_libdir}/libpaps.so
 
 %changelog
+* Mon Sep  1 2008 Akira TAGOH <tagoh at redhat.com> - 0.6.8-7
+- paps-langinfo.patch: Updated.
+- paps-exitcode.patch: Updated.
+
 * Fri May 16 2008 Akira TAGOH <tagoh at redhat.com> - 0.6.8-6
 - paps-cups.patch: Fix printing with -o landscape in CUPS. (#222137)
 - paps-autoconf262.patch: Fix an error on autoreconf.


--- paps-0.6.6-exitcode.patch DELETED ---


--- paps-0.6.6-langinfo.patch DELETED ---