rpms/paps/F-8 paps-cups.patch, 1.12, 1.13 paps.spec, 1.26, 1.27 paps-0.6.6-fix-wcswidth.patch, 1.1, NONE
Akira TAGOH (tagoh)
fedora-extras-commits at redhat.com
Fri May 16 12:07:56 UTC 2008
- Previous message (by thread): rpms/paps/F-9 paps-autoconf262.patch, NONE, 1.1 paps-dsc-compliant.patch, NONE, 1.1 paps-cups.patch, 1.12, 1.13 paps.spec, 1.31, 1.32 paps-0.6.6-fix-wcswidth.patch, 1.1, NONE paps-0.6.8-dsc-compliant.patch, 1.3, NONE
- Next message (by thread): rpms/paps/F-8 paps-autoconf262.patch, NONE, 1.1 paps-dsc-compliant.patch, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tagoh
Update of /cvs/pkgs/rpms/paps/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28119
Modified Files:
paps-cups.patch paps.spec
Removed Files:
paps-0.6.6-fix-wcswidth.patch
Log Message:
* 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-cups.patch:
Index: paps-cups.patch
===================================================================
RCS file: /cvs/pkgs/rpms/paps/F-8/paps-cups.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- paps-cups.patch 3 Dec 2007 01:29:55 -0000 1.12
+++ paps-cups.patch 16 May 2008 12:07:13 -0000 1.13
@@ -1,6 +1,6 @@
diff -pruN paps-0.6.8.orig/configure.in paps-0.6.8/configure.in
--- paps-0.6.8.orig/configure.in 2007-01-19 20:06:10.000000000 +0900
-+++ paps-0.6.8/configure.in 2007-11-30 18:40:32.000000000 +0900
++++ paps-0.6.8/configure.in 2008-05-15 22:46:49.000000000 +0900
@@ -7,6 +7,19 @@ AC_LANG_C
AC_PROG_CC
AM_PROG_LIBTOOL
@@ -22,8 +22,8 @@
DX_CHM_FEATURE(OFF)
DX_CHI_FEATURE(OFF)
diff -pruN paps-0.6.8.orig/src/Makefile.am paps-0.6.8/src/Makefile.am
---- paps-0.6.8.orig/src/Makefile.am 2007-11-30 18:40:15.000000000 +0900
-+++ paps-0.6.8/src/Makefile.am 2007-11-30 18:40:32.000000000 +0900
+--- paps-0.6.8.orig/src/Makefile.am 2008-05-15 22:46:34.000000000 +0900
++++ paps-0.6.8/src/Makefile.am 2008-05-15 22:46:49.000000000 +0900
@@ -5,10 +5,10 @@ libpapsinc_HEADERS = libpaps.h
libpapsincdir = $(includedir)
@@ -38,8 +38,8 @@
EXTRA_DIST = test_libpaps.c paps.1
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 2007-11-30 18:40:15.000000000 +0900
-+++ paps-0.6.8/src/paps.c 2007-11-30 18:47:28.000000000 +0900
+--- paps-0.6.8.orig/src/paps.c 2008-05-15 22:46:34.000000000 +0900
++++ paps-0.6.8/src/paps.c 2008-05-15 22:48:42.000000000 +0900
@@ -31,6 +31,7 @@
#include <string.h>
#include <time.h>
@@ -80,7 +80,7 @@
/* Set locale from environment. */
setlocale(LC_ALL, "");
-@@ -348,6 +353,134 @@ int main(int argc, char *argv[])
+@@ -348,6 +353,128 @@ int main(int argc, char *argv[])
g_option_context_add_main_entries(ctxt, entries, NULL);
#endif
@@ -148,14 +148,8 @@
+ if ((val = cupsGetOption("landscape", num_options, options)) != NULL) {
+ if (g_ascii_strcasecmp(val, "no") &&
+ g_ascii_strcasecmp(val, "off") &&
-+ g_ascii_strcasecmp(val, "false")) {
-+ /* We really need to deal with the landscape orientation because
-+ * pstops doesn't deal with the position where it should appears.
-+ * However this causes the unnecessary rotation by pstops. so paps
-+ * will puts the fake Orientation tag and stop rotating in PS.
-+ */
++ g_ascii_strcasecmp(val, "false"))
+ do_landscape = TRUE;
-+ }
+ }
+ /* XXX: need to support orientation-requested? */
+ if ((val = cupsGetOption("page-left", num_options, options)) != NULL) {
@@ -215,7 +209,7 @@
/* Parse command line */
if (!g_option_context_parse(ctxt, &argc, &argv, &error))
{
-@@ -374,6 +507,8 @@ int main(int argc, char *argv[])
+@@ -374,6 +501,8 @@ int main(int argc, char *argv[])
IN = stdin;
}
title = filename_in;
@@ -224,7 +218,7 @@
paps = paps_new();
pango_context = paps_get_pango_context (paps);
-@@ -392,8 +527,10 @@ int main(int argc, char *argv[])
+@@ -392,8 +521,10 @@ int main(int argc, char *argv[])
pango_context_set_font_description (pango_context, font_description);
/* Page layout */
@@ -237,7 +231,7 @@
if (num_columns == 1)
total_gutter_width = 0;
-@@ -456,6 +593,8 @@ int main(int argc, char *argv[])
+@@ -456,6 +587,8 @@ int main(int argc, char *argv[])
page_layout.pango_dir = pango_dir;
page_layout.filename = filename_in;
page_layout.header_font_desc = header_font_desc;
@@ -246,7 +240,7 @@
/* calculate x-coordinate scale */
if (page_layout.cpi > 0.0L)
-@@ -756,6 +895,12 @@ split_text_into_paragraphs (PangoContext
+@@ -756,6 +889,12 @@ split_text_into_paragraphs (PangoContext
if (wc == (gunichar)-1)
{
fprintf (stderr, "%s: Invalid character in input\n", g_get_prgname ());
@@ -259,15 +253,19 @@
wc = 0;
}
if (!*p || !wc || wc == '\n' || wc == '\f')
-@@ -925,6 +1070,7 @@ void print_postscript_header(FILE *OUT,
+@@ -925,21 +1064,32 @@ void print_postscript_header(FILE *OUT,
int orientation = page_layout->page_width > page_layout->page_height;
int bb_page_width = page_layout->page_width;
int bb_page_height = page_layout->page_height;
+ char *owner = NULL;
/* Keep bounding box non-rotated to make ggv happy */
- if (orientation)
-@@ -934,12 +1080,20 @@ void print_postscript_header(FILE *OUT,
+- if (orientation)
++ /* ensure the correct bounding box for CUPS */
++ if (orientation && !page_layout->cups_mode)
+ {
+ int tmp = bb_page_width;
+ bb_page_width = bb_page_height;
bb_page_height = tmp;
}
@@ -281,6 +279,7 @@
+ }
fprintf(OUT,
"%%!PS-Adobe-3.0\n"
++ "%s"
"%%%%Title: %s\n"
"%%%%Creator: paps version 0.6.7 by Dov Grobgeld\n"
"%%%%Pages: (atend)\n"
@@ -289,31 +288,35 @@
"%%%%BeginProlog\n"
"%%%%Orientation: %s\n"
"/papsdict 1 dict def\n"
-@@ -989,8 +1143,13 @@ void print_postscript_header(FILE *OUT,
+@@ -961,7 +1111,7 @@ void print_postscript_header(FILE *OUT,
+ " pagewidth\n"
+ " /pagewidth pageheight def\n"
+ " /pageheight exch def\n"
+- " /orientation 3 def\n"
++ " /orientation %d def\n"
+ " } if\n"
+ " 2 dict\n"
+ " dup /PageSize [pagewidth pageheight] put\n"
+@@ -986,11 +1136,21 @@ void print_postscript_header(FILE *OUT,
+ " 90 rotate\n"
+ " 0 pageheight neg translate\n"
+ "} def\n",
++ /*
++ * Put %%cupsRotation tag to prevent the rotation in pstops.
++ * This breaks paps's behavior to make it in landscape say.
++ * (RH#222137)
++ */
++ (page_layout->cups_mode ? "%cupsRotation: 0\n" : ""),
title,
bb_page_width,
bb_page_height,
- orientation_names[orientation]
+ owner,
-+ /* Put the fake orientation tag if paps is currently running under
-+ * the CUPS filter mode. (#222137)
-+ */
-+ orientation_names[orientation && !page_layout->cups_mode]
++ orientation_names[orientation],
++ /* For landscape, rotate page to portrait orientation for CUPS (RH#222137) */
++ page_layout->cups_mode ? 2 : 3
);
+ g_free(owner);
fprintf(OUT,
"%% User settings\n"
-@@ -1015,7 +1174,11 @@ void print_postscript_header(FILE *OUT,
- page_layout->left_margin,
- page_layout->page_height - bodytop,
- bool_name[page_layout->do_separation_line>0],
-- bool_name[page_layout->do_landscape>0],
-+ /* just ignore the landscape flag when paps is currently running
-+ * under the CUPS filter mode. this will stop rotating in PS that
-+ * paps generates. (#222137)
-+ */
-+ bool_name[page_layout->do_landscape>0 && !page_layout->cups_mode],
- bool_name[page_layout->do_tumble>0],
- bool_name[page_layout->do_duplex>0]
- );
Index: paps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paps/F-8/paps.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- paps.spec 3 Dec 2007 01:29:55 -0000 1.26
+++ paps.spec 16 May 2008 12:07:13 -0000 1.27
@@ -1,6 +1,6 @@
Name: paps
Version: 0.6.8
-Release: 1%{?dist}
+Release: 6%{?dist}
License: LGPLv2+
URL: http://paps.sourceforge.net/
@@ -19,7 +19,8 @@
Patch4: paps-0.6.6-exitcode.patch
Patch50: paps-cups.patch
Patch51: paps-cpilpi.patch
-Patch61: paps-0.6.6-fix-wcswidth.patch
+Patch52: paps-dsc-compliant.patch
+Patch53: paps-autoconf262.patch
Summary: Plain Text to PostScript converter
Group: Applications/Publishing
@@ -53,7 +54,8 @@
%patch4 -p1 -b .exitcode
%patch50 -p1 -b .cups
%patch51 -p1 -b .cpilpi
-#%patch11 -p1 -b .wcswidth
+%patch52 -p1 -b .dsc
+%patch53 -p1 -b .autoconf262
autoreconf
@@ -96,6 +98,22 @@
%{_libdir}/libpaps.so
%changelog
+* 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.
+
+* Tue Feb 12 2008 Akira TAGOH <tagoh at redhat.com> - 0.6.8-5
+- Rebuild for gcc-4.3.
+
+* Wed Jan 23 2008 Akira TAGOH <tagoh at redhat.com> - 0.6.8-4
+- Fix an exception on ghostscript. (#429275)
+
+* Tue Jan 15 2008 Akira TAGOH <tagoh at redhat.com> - 0.6.8-3
+- Put %%%%Pages: after %%%%Trailer. (#424951)
+
+* Thu Jan 10 2008 Akira TAGOH <tagoh at redhat.com> - 0.6.8-2
+- paps-0.6.8-dsc-compliant.patch: Patch out to be DSC compliant. (#424951)
+
* Fri Nov 30 2007 Akira TAGOH <tagoh at redhat.com> - 0.6.8-1
- New upstream release.
- Remove patches merged and unnecessary anymore:
--- paps-0.6.6-fix-wcswidth.patch DELETED ---
- Previous message (by thread): rpms/paps/F-9 paps-autoconf262.patch, NONE, 1.1 paps-dsc-compliant.patch, NONE, 1.1 paps-cups.patch, 1.12, 1.13 paps.spec, 1.31, 1.32 paps-0.6.6-fix-wcswidth.patch, 1.1, NONE paps-0.6.8-dsc-compliant.patch, 1.3, NONE
- Next message (by thread): rpms/paps/F-8 paps-autoconf262.patch, NONE, 1.1 paps-dsc-compliant.patch, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list