|
|
Author: tagoh
Update of /cvs/dist/rpms/paps/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv30272
Modified Files:
.cvsignore paps-cups.patch paps.spec sources
Added Files:
paps-0.6.8-shared.patch paps-0.6.8-wordwrap.patch
paps-cpilpi.patch
Removed Files:
paps-0.6.6-cpilpi.patch paps-0.6.6-encoding.patch
paps-0.6.6-font-option.patch paps-0.6.6-lcctype.patch
paps-0.6.6-segfault.patch paps-0.6.6-wordwrap.patch
paps-formfeed.patch paps-makefile.patch
paps-typo-font-scale.patch
Log Message:
* Fri Nov 30 2007 Akira TAGOH <tagoh@xxxxxxxxxx> - 0.6.8-1
- New upstream release.
- Remove patches merged and unnecessary anymore:
- paps-makefile.patch
- paps-formfeed.patch
- paps-0.6.6-encoding.patch
- paps-typo-font-scale.patch
- paps-0.6.6-segfault.patch
- paps-0.6.6-font-option.patch
- paps-0.6.6-lcctype.patch
- paps-0.6.8-shared.patch: Enable building shared library.
- paps-0.6.8-wordwrap.patch: Update a bit to get it working without an wordwrap
mode.
- Add paps-libs and paps-devel package.
- paps-cups.patch: Update.
- paps-cpilpi.patch: Update.
- Fix the wrong rendering with CPI option. (#237202)
- Fix the unnecessary rotation with the landscape option when paps is running
as CUPS filter. (#222137)
paps-0.6.8-shared.patch:
Makefile.am | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
--- NEW FILE paps-0.6.8-shared.patch ---
diff -ruN paps-0.6.8.orig/src/Makefile.am paps-0.6.8/src/Makefile.am
--- paps-0.6.8.orig/src/Makefile.am 2006-04-17 16:42:08.000000000 +0900
+++ paps-0.6.8/src/Makefile.am 2007-11-16 11:50:07.000000000 +0900
@@ -1,15 +1,15 @@
man_MANS = paps.1
-lib_LIBRARIES = libpaps.a
-libpaps_a_SOURCES = libpaps.c
-libpaps_a_inc_HEADERS = libpaps.h
-libpaps_a_incdir = $(includedir)
+lib_LTLIBRARIES = libpaps.la
+libpaps_la_SOURCES = libpaps.c
+libpapsinc_HEADERS = libpaps.h
+libpapsincdir = $(includedir)
bin_PROGRAMS = paps
paps_CFLAGS = -Wall
paps_SOURCES = paps.c
-paps_LDADD = $(lib_LIBRARIES) $(all_libraries)
+paps_LDADD = $(lib_LTLIBRARIES) $(all_libraries)
paps_LDFLAGS = `pkg-config --libs pangoft2`
-paps_DEPENDENCIES = $(lib_LIBRARIES)
+paps_DEPENDENCIES = $(lib_LTLIBRARIES)
EXTRA_DIST = test_libpaps.c paps.1
@@ -21,7 +21,7 @@
test_libpaps_SOURCES = test_libpaps.c
-test_libpaps_LDADD = $(lib_LIBRARIES) $(all_libraries)
+test_libpaps_LDADD = $(lib_LTLIBRARIES) $(all_libraries)
test_libpaps_LDFLAGS = `pkg-config --libs pangoft2`
-test_libpaps_DEPENDENCIES = $(lib_LIBRARIES)
+test_libpaps_DEPENDENCIES = $(lib_LTLIBRARIES)
paps-0.6.8-wordwrap.patch:
paps.c | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
--- NEW FILE paps-0.6.8-wordwrap.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 2007-04-13 14:04:14.000000000 +0900
+++ paps-0.6.8/src/paps.c 2007-11-16 12:28:11.000000000 +0900
@@ -723,9 +723,12 @@ split_text_into_paragraphs (PangoContext
pango_layout_set_alignment (para->layout,
page_layout->pango_dir == PANGO_DIRECTION_LTR
? PANGO_ALIGN_LEFT : PANGO_ALIGN_RIGHT);
- pango_layout_set_wrap (para->layout, PANGO_WRAP_WORD_CHAR);
-
- pango_layout_set_width (para->layout, paint_width * PANGO_SCALE);
+ if (page_layout->do_wordwrap) {
+ pango_layout_set_wrap (para->layout, PANGO_WRAP_WORD_CHAR);
+ pango_layout_set_width (para->layout, paint_width * PANGO_SCALE);
+ } else {
+ pango_layout_set_width (para->layout, -1);
+ }
para->height = 0;
result = g_list_prepend (result, para);
@@ -754,9 +757,13 @@ split_text_into_paragraphs (PangoContext
pango_layout_set_alignment (para->layout,
page_layout->pango_dir ==
PANGO_DIRECTION_LTR
? PANGO_ALIGN_LEFT :
PANGO_ALIGN_RIGHT);
- pango_layout_set_wrap (para->layout, PANGO_WRAP_WORD_CHAR);
+ if (page_layout->do_wordwrap) {
+ pango_layout_set_wrap (para->layout, PANGO_WRAP_WORD_CHAR);
+ pango_layout_set_width (para->layout, paint_width *
PANGO_SCALE);
+ } else {
+ pango_layout_set_width (para->layout, -1);
+ }
- pango_layout_set_width (para->layout, paint_width * PANGO_SCALE);
para->height = 0;
last_para = next;
paps-cpilpi.patch:
paps.c | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
--- NEW FILE paps-cpilpi.patch ---
diff -pruN -x .libs -x '*o' -x '*ps' ../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-28 16:20:56.000000000 +0900
+++ paps-0.6.8/src/paps.c 2007-11-30 17:53:06.000000000 +0900
@@ -92,8 +92,8 @@ typedef struct {
gchar *filename;
gchar *header_font_desc;
gchar *owner;
- gint lpi;
- gint cpi;
+ gdouble lpi;
+ gdouble cpi;
} page_layout_t;
typedef struct {
@@ -376,6 +376,7 @@ int main(int argc, char *argv[])
bottom_margin = 36;
page_width = 612;
page_height = 792;
+ do_stretch_chars = TRUE;
if (argc < 6 || argc > 7) {
fprintf(stderr, "ERROR: %s job-id user title copies
options [file]\n", prgname);
@@ -596,7 +597,8 @@ int main(int argc, char *argv[])
/* calculate x-coordinate scale */
if (page_layout.cpi > 0.0L)
{
- double scale;
+ gint font_size;
+
fontmap = pango_ft2_font_map_new ();
fontset = pango_font_map_load_fontset (fontmap, pango_context,
font_description, get_language ());
metrics = pango_fontset_get_metrics (fontset);
@@ -608,13 +610,10 @@ int main(int argc, char *argv[])
pango_font_metrics_unref (metrics);
g_object_unref (G_OBJECT (fontmap));
- // Now figure out how to scale the font to get that size
- scale = 1 / page_layout.cpi * 72.0 * PANGO_SCALE / max_width;
-
+ font_size = pango_font_description_get_size (font_description);
// update the font size to that width
- pango_font_description_set_size (font_description,
(int)(atoi(DEFAULT_FONT_SIZE) * PANGO_SCALE * scale));
+ pango_font_description_set_size (font_description, font_size *
page_layout.scale_x);
pango_context_set_font_description (pango_context, font_description);
-
}
page_layout.scale_x = page_layout.scale_y = 1.0;
@@ -1002,6 +1001,7 @@ output_pages(FILE *OUT,
int column_y_pos = 0;
int page_idx = 1;
int pango_column_height = page_layout->column_height *
page_layout->pt_to_pixel * PANGO_SCALE;
+ int height = 0;
LineLink *prev_line_link = NULL;
start_page(OUT, page_idx);
@@ -1039,17 +1039,17 @@ output_pages(FILE *OUT,
);
}
}
+ if (page_layout->lpi > 0.0L)
+ height = (int)(1.0 / page_layout->lpi * 72.0 *
page_layout->pt_to_pixel * PANGO_SCALE);
+ else
+ height = line_link->logical_rect.height;
draw_line_to_page(OUT,
column_idx,
- column_y_pos+line_link->logical_rect.height,
+ column_y_pos+height,
page_layout,
line);
- if (page_layout->lpi > 0.0L)
- column_y_pos += (int)(1.0 / page_layout->lpi * 72.0 *
page_layout->pt_to_pixel * PANGO_SCALE);
- else
- column_y_pos += line_link->logical_rect.height;
-
+ column_y_pos += height;
pango_lines = pango_lines->next;
prev_line_link = line_link;
}
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/paps/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 29 Jun 2006 10:55:20 -0000 1.3
+++ .cvsignore 3 Dec 2007 02:08:06 -0000 1.4
@@ -2,3 +2,4 @@
*gz
*bz2
paps-0.6.6.tar.gz
+paps-0.6.8.tar.gz
paps-cups.patch:
configure.in | 13 ++++
src/Makefile.am | 4 -
src/paps.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
3 files changed, 185 insertions(+), 9 deletions(-)
Index: paps-cups.patch
===================================================================
RCS file: /cvs/dist/rpms/paps/FC-6/paps-cups.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- paps-cups.patch 7 Mar 2007 12:10:32 -0000 1.10
+++ paps-cups.patch 3 Dec 2007 02:08:07 -0000 1.11
@@ -1,7 +1,7 @@
-diff -pruN -x Makefile -x Makefile.in -x '*.m4' -x autom4te.cache -x
'config.*' -x configure -x doc -x libtool -x .deps -x .libs -x '*.ps' -x foo -x
paps -x 'lib*' -x texttopaps -x '*o' -x '*.cups' -x 'test*' -x 'stamp*'
paps-0.6.6.orig/configure.in paps-0.6.6/configure.in
---- paps-0.6.6.orig/configure.in 2006-04-28 04:41:36.000000000 +0900
-+++ paps-0.6.6/configure.in 2007-02-15 23:34:24.000000000 +0900
-@@ -7,4 +7,17 @@ AC_LANG_C
+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
+@@ -7,6 +7,19 @@ AC_LANG_C
AC_PROG_CC
AM_PROG_LIBTOOL
@@ -10,55 +10,57 @@
+dnl ======================================================
+AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
+if test "$CUPS_CONFIG" = "no"; then
-+ AC_MSG_ERROR([Please install cups development packages])
++ AC_MSG_ERROR([Please install cups development packages/files])
+fi
-+CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
++CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed -e 's/-O[0-9]*//' -e 's/-m[^\t]*//g'`
+CUPS_LIBS=`$CUPS_CONFIG --libs`
+
+AC_SUBST(CUPS_CFLAGS)
+AC_SUBST(CUPS_LIBS)
+
- AC_OUTPUT(Makefile src/Makefile doc/Makefile)
-diff -pruN -x Makefile -x Makefile.in -x '*.m4' -x autom4te.cache -x
'config.*' -x configure -x doc -x libtool -x .deps -x .libs -x '*.ps' -x foo -x
paps -x 'lib*' -x texttopaps -x '*o' -x '*.cups' -x 'test*' -x 'stamp*'
paps-0.6.6.orig/src/Makefile.am paps-0.6.6/src/Makefile.am
---- paps-0.6.6.orig/src/Makefile.am 2007-02-15 22:59:47.000000000 +0900
-+++ paps-0.6.6/src/Makefile.am 2007-02-15 23:34:24.000000000 +0900
-@@ -5,10 +5,10 @@ libpaps_a_inc_HEADERS = libpaps.h
- libpaps_a_incdir = $(includedir)
+ DX_HTML_FEATURE(ON)
+ 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
+@@ -5,10 +5,10 @@ libpapsinc_HEADERS = libpaps.h
+ libpapsincdir = $(includedir)
bin_PROGRAMS = paps
-paps_CFLAGS = -Wall
+paps_CFLAGS = -Wall $(CUPS_CFLAGS)
paps_SOURCES = paps.c
- paps_LDADD = $(noinst_LIBRARIES) $(all_libraries)
+ paps_LDADD = $(lib_LTLIBRARIES) $(all_libraries)
-paps_LDFLAGS = `pkg-config --libs pangoft2`
+paps_LDFLAGS = `pkg-config --libs pangoft2` $(CUPS_LIBS)
- paps_DEPENDENCIES = $(noinst_LIBRARIES)
+ paps_DEPENDENCIES = $(lib_LTLIBRARIES)
EXTRA_DIST = test_libpaps.c paps.1
-diff -pruN -x Makefile -x Makefile.in -x '*.m4' -x autom4te.cache -x
'config.*' -x configure -x doc -x libtool -x .deps -x .libs -x '*.ps' -x foo -x
paps -x 'lib*' -x texttopaps -x '*o' -x '*.cups' -x 'test*' -x 'stamp*'
paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
---- paps-0.6.6.orig/src/paps.c 2007-02-15 22:59:48.000000000 +0900
-+++ paps-0.6.6/src/paps.c 2007-03-07 20:58:31.000000000 +0900
-@@ -32,6 +32,7 @@
+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
+@@ -31,6 +31,7 @@
+ #include <string.h>
#include <time.h>
#include <locale.h>
- #include <wchar.h>
+#include <cups/cups.h>
#define BUFSIZE 1024
#define DEFAULT_FONT_FAMILY "Monospace"
-@@ -85,9 +86,11 @@ typedef struct {
- gboolean do_separation_line;
- gboolean do_draw_contour;
+@@ -86,9 +87,11 @@ typedef struct {
gboolean do_wordwrap;
+ gboolean do_use_markup;
+ gboolean do_stretch_chars;
+ gboolean cups_mode;
PangoDirection pango_dir;
gchar *filename;
gchar *header_font_desc;
+ gchar *owner;
+ gint lpi;
+ gint cpi;
} page_layout_t;
-
- typedef struct {
-@@ -314,8 +317,8 @@ int main(int argc, char *argv[])
+@@ -320,8 +323,8 @@ int main(int argc, char *argv[])
int num_pages = 1;
int gutter_width = 40;
int total_gutter_width;
@@ -69,18 +71,18 @@
int do_tumble = -1; /* -1 means not initialized */
int do_duplex = -1;
gchar *paps_header = NULL;
-@@ -324,6 +327,8 @@ int main(int argc, char *argv[])
- int header_sep = 20;
+@@ -331,6 +334,8 @@ int main(int argc, char *argv[])
int max_width = 0, w;
GIConv cvh = NULL;
+ GOptionGroup *options;
+ gboolean cups_mode = FALSE;
+ gchar *page_owner = NULL;
/* Set locale from environment. */
setlocale(LC_ALL, "");
-@@ -333,6 +338,128 @@ int main(int argc, char *argv[])
-
+@@ -348,6 +353,134 @@ int main(int argc, char *argv[])
g_option_context_add_main_entries(ctxt, entries, NULL);
+ #endif
+ /* check if the process is being invoked as CUPS filter */
+ G_STMT_START {
@@ -92,13 +94,13 @@
+ const char *val;
+
+ if (strncmp(prgname, "texttopaps", 10) == 0 ||
-+ getenv ("CUPS_SERVER") != NULL) {
++ getenv("CUPS_SERVER") != NULL) {
+ g_set_prgname(prgname);
+ /* argument format should be job-id user title copies options
[file] */
+ cups_mode = TRUE;
+ /* set default values */
-+ lpi = 6.0L;
-+ cpi = 10.0L;
++ page_layout.lpi = 6.0L;
++ page_layout.cpi = 10.0L;
+ left_margin = 18;
+ right_margin = 18;
+ top_margin = 36;
@@ -115,7 +117,7 @@
+ IN = stdin;
+ } else {
+ filename_in = argv[6];
-+ if ((IN = fopen(argv[6], "rb")) == NULL) {
++ if ((IN = fopen(filename_in, "rb")) == NULL) {
+ fprintf(stderr, "ERROR: unable to open print
file -\n");
+ exit(1);
+ }
@@ -147,9 +149,12 @@
+ if (g_ascii_strcasecmp(val, "no") &&
+ g_ascii_strcasecmp(val, "off") &&
+ g_ascii_strcasecmp(val, "false")) {
-+ /* We don't need to process the documentation
for orientation support.
-+ * pstops certainly does. (#222137)
++ /* 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.
+ */
++ do_landscape = TRUE;
+ }
+ }
+ /* XXX: need to support orientation-requested? */
@@ -172,8 +177,9 @@
+ ppdIsMarked(ppd, "EFDuplex", "DuplexNoTumble") ||
+ ppdIsMarked(ppd, "EFDuplex", "DuplexTumble") ||
+ ppdIsMarked(ppd, "KD03Duplex", "DuplexNoTumble") ||
-+ ppdIsMarked(ppd, "KD03Duplex", "DuplexTumble"))
++ ppdIsMarked(ppd, "KD03Duplex", "DuplexTumble")) {
+ do_duplex = TRUE;
++ }
+ if ((val = cupsGetOption("wrap", num_options, options)) !=
NULL) {
+ do_wordwrap = !g_ascii_strcasecmp(val, "true") ||
+ !g_ascii_strcasecmp(val, "on") ||
@@ -183,21 +189,23 @@
+ num_columns = atoi(val);
+ }
+ if ((val = cupsGetOption("cpi", num_options, options)) != NULL)
{
-+ cpi = atof(val);
++ page_layout.cpi = atof(val);
+ }
+ if ((val = cupsGetOption("lpi", num_options, options)) != NULL)
{
-+ lpi = atof(val);
++ page_layout.lpi = atof(val);
+ }
+ if (getenv("CHARSET") != NULL) {
+ char *charset = getenv("CHARSET");
+ /* Map CUPS charset names to real ones.
+ *
http://cups.org/newsgroups.php?s9797+gcups.general+v9797+T1
+ */
-+ if (!g_ascii_strcasecmp(charset, "windows-932"))
++ if (!g_ascii_strcasecmp(charset, "windows-932")) {
+ charset = "WINDOWS-31J";
++ }
+ if (g_ascii_strcasecmp(charset, "utf-8") &&
-+ g_ascii_strcasecmp(charset, "utf8"))
++ g_ascii_strcasecmp(charset, "utf8")) {
+ encoding = g_strdup(charset);
++ }
+ }
+ }
+ } G_STMT_END;
@@ -207,7 +215,7 @@
/* Parse command line */
if (!g_option_context_parse(ctxt, &argc, &argv, &error))
{
-@@ -359,6 +486,8 @@ int main(int argc, char *argv[])
+@@ -374,6 +507,8 @@ int main(int argc, char *argv[])
IN = stdin;
}
title = filename_in;
@@ -216,20 +224,20 @@
paps = paps_new();
pango_context = paps_get_pango_context (paps);
-@@ -377,8 +506,10 @@ int main(int argc, char *argv[])
+@@ -392,8 +527,10 @@ int main(int argc, char *argv[])
pango_context_set_font_description (pango_context, font_description);
/* Page layout */
- page_width = paper_sizes[(int)paper_type].width;
- page_height = paper_sizes[(int)paper_type].height;
+ if (page_width < 0)
-+ page_width = paper_sizes[(int)paper_type].width;
++ page_width = paper_sizes[(int)paper_type].width;
+ if (page_height < 0)
-+ page_height = paper_sizes[(int)paper_type].height;
++ page_height = paper_sizes[(int)paper_type].height;
if (num_columns == 1)
total_gutter_width = 0;
-@@ -439,6 +570,8 @@ int main(int argc, char *argv[])
+@@ -456,6 +593,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;
@@ -237,21 +245,21 @@
+ page_layout.cups_mode = cups_mode;
/* calculate x-coordinate scale */
- if (cpi > 0.0L)
-@@ -584,6 +717,12 @@ split_text_into_paragraphs (PangoContext
- if (wc == (gunichar)-1)
- {
- fprintf (stderr, "%s: Invalid character in input\n", g_get_prgname
());
-+ if (page_layout->cups_mode)
-+ {
-+ /* try to continue parsing texts */
-+ p = next;
-+ continue;
-+ }
- wc = 0;
- }
- if (!*p || !wc || wc == '\n' || wc == '\f')
-@@ -810,6 +949,7 @@ void print_postscript_header(FILE *OUT,
+ if (page_layout.cpi > 0.0L)
+@@ -756,6 +895,12 @@ split_text_into_paragraphs (PangoContext
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, "%s: Invalid character in input\n",
g_get_prgname ());
++ if (page_layout->cups_mode)
++ {
++ /* try to continue parsing texts */
++ p = next;
++ continue;
++ }
+ wc = 0;
+ }
+ if (!*p || !wc || wc == '\n' || wc == '\f')
+@@ -925,6 +1070,7 @@ 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;
@@ -259,7 +267,7 @@
/* Keep bounding box non-rotated to make ggv happy */
if (orientation)
-@@ -819,12 +959,20 @@ void print_postscript_header(FILE *OUT,
+@@ -934,12 +1080,20 @@ void print_postscript_header(FILE *OUT,
bb_page_height = tmp;
}
@@ -274,21 +282,38 @@
fprintf(OUT,
"%%!PS-Adobe-3.0\n"
"%%%%Title: %s\n"
- "%%%%Creator: paps version 0.6.3 by Dov Grobgeld\n"
+ "%%%%Creator: paps version 0.6.7 by Dov Grobgeld\n"
"%%%%Pages: (atend)\n"
- "%%%%BoundingBox: 0 0 %d %d\n"
+ "%%%%BoundingBox: 0 0 %d %d\n%s"
"%%%%BeginProlog\n"
"%%%%Orientation: %s\n"
"/papsdict 1 dict def\n"
-@@ -874,8 +1022,10 @@ void print_postscript_header(FILE *OUT,
+@@ -989,8 +1143,13 @@ void print_postscript_header(FILE *OUT,
title,
bb_page_width,
bb_page_height,
+- orientation_names[orientation]
+ owner,
- orientation_names[orientation]
++ /* Put the fake orientation tag if paps is currently running under
++ * the CUPS filter mode. (#222137)
++ */
++ orientation_names[orientation && !page_layout->cups_mode]
);
+ 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/dist/rpms/paps/FC-6/paps.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- paps.spec 7 Jun 2007 10:56:09 -0000 1.22
+++ paps.spec 3 Dec 2007 02:08:07 -0000 1.23
@@ -1,64 +1,64 @@
Name: paps
-Version: 0.6.6
-Release: 20%{?dist}
+Version: 0.6.8
+Release: 1%{?dist}
-License: LGPL
+License: LGPLv2+
URL: http://paps.sourceforge.net/
Source0: http://prdownloads.sourceforge.net/paps/paps-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pango-devel automake autoconf libtool doxygen cups-devel
-Patch0: paps-makefile.patch
-## fixed in CVS
-Patch2: paps-formfeed.patch
-## fixed in CVS
-Patch3: paps-0.6.6-encoding.patch
-## fixed in CVS
-Patch4: paps-typo-font-scale.patch
-## fixed in CVS
-Patch5: paps-0.6.6-segfault.patch
-## fixed in CVS
-Patch6: paps-0.6.6-font-option.patch
-## fixed in CVS
-Patch7: paps-0.6.6-lcctype.patch
-## fixed in CVS
-Patch8: paps-0.6.6-wordwrap.patch
-## fixed in CVS
-Patch9: paps-0.6.6-cpilpi.patch
-Patch10: paps-0.6.6-exitcode.patch
-Patch11: paps-0.6.6-fix-wcswidth.patch
-Patch12: paps-0.6.6-langinfo.patch
-Patch13: paps-0.6.6-lcnumeric.patch
+##
https://sourceforge.net/tracker/index.php?func=detail&aid=1832897&group_id=153049&atid=786241
+Patch0: paps-0.6.8-shared.patch
+##
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
+##
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
Patch50: paps-cups.patch
+Patch51: paps-cpilpi.patch
+Patch61: paps-0.6.6-fix-wcswidth.patch
Summary: Plain Text to PostScript converter
Group: Applications/Publishing
%description
paps is a PostScript converter from plain text file using Pango.
+%package libs
+Summary: Libraries for paps
+Group: Development/Libraries
+%description libs
+paps is a PostScript converter from plain text file using Pango.
+
+This package contains the library for paps.
+
+%package devel
+Summary: Development files for paps
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+%description devel
+paps is a PostScript converter from plain text file using Pango.
+
+This package contains the development files that is necessary to develop
+applications using paps API.
%prep
%setup -q
-%patch0 -p1 -b .makefile
-%patch2 -p1 -b .formfeed
-%patch3 -p1 -b .encoding
-%patch4 -p0 -b .typo
-%patch5 -p1 -b .segfault
-%patch6 -p1 -b .fontopt
-%patch7 -p1 -b .lcctype
-%patch8 -p1 -b .wordwrap
-%patch9 -p1 -b .cpilpi
-%patch10 -p1 -b .exitcode
-%patch11 -p1 -b .wcswidth
-%patch12 -p1 -b .langinfo
-%patch13 -p1 -b .lcnumeric
+%patch0 -p1 -b .shared
+%patch1 -p1 -b .wordwrap
+%patch2 -p1 -b .langinfo
+%patch3 -p1 -b .lcnumeric
+%patch4 -p1 -b .exitcode
%patch50 -p1 -b .cups
-aclocal
-automake
-autoconf
+%patch51 -p1 -b .cpilpi
+#%patch11 -p1 -b .wcswidth
+autoreconf
%build
-%configure
+%configure --disable-static
make %{?_smp_mflags}
@@ -66,7 +66,9 @@
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT%{_includedir}
+
+# remove unnecessary files
+rm $RPM_BUILD_ROOT%{_libdir}/libpaps.la
# make a symlink for CUPS filter
%{__mkdir_p} $RPM_BUILD_ROOT/usr/lib/cups/filter # Not libdir
@@ -82,8 +84,44 @@
%{_mandir}/man1/paps.1*
/usr/lib/cups/filter/texttopaps
+%files libs
+%defattr(-, root, root, -)
+%doc COPYING.LIB
+%{_libdir}/libpaps.so.*
+
+%files devel
+%defattr(-, root, root, -)
+%doc COPYING.LIB
+%{_includedir}/libpaps.h
+%{_libdir}/libpaps.so
%changelog
+* Fri Nov 30 2007 Akira TAGOH <tagoh@xxxxxxxxxx> - 0.6.8-1
+- New upstream release.
+ - Remove patches merged and unnecessary anymore:
+ - paps-makefile.patch
+ - paps-formfeed.patch
+ - paps-0.6.6-encoding.patch
+ - paps-typo-font-scale.patch
+ - paps-0.6.6-segfault.patch
+ - paps-0.6.6-font-option.patch
+ - paps-0.6.6-lcctype.patch
+- paps-0.6.8-shared.patch: Enable building shared library.
+- paps-0.6.8-wordwrap.patch: Update a bit to get it working without an wordwrap
+ mode.
+- Add paps-libs and paps-devel package.
+- paps-cups.patch: Update.
+- paps-cpilpi.patch: Update.
+- Fix the wrong rendering with CPI option. (#237202)
+- Fix the unnecessary rotation with the landscape option when paps is running
+ as CUPS filter. (#222137)
+
+* Thu Aug 23 2007 Akira TAGOH <tagoh@xxxxxxxxxx> - 0.6.6-21
+- Rebuild
+
+* Fri Aug 10 2007 Akira TAGOH <tagoh@xxxxxxxxxx>
+- Update License tag.
+
* Wed May 30 2007 Akira TAGOH <tagoh@xxxxxxxxxx> - 0.6.6-20
- Fix to not do wordwrap when 'wrap=false' is given. (#240588)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/paps/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 27 Jun 2006 07:11:43 -0000 1.2
+++ sources 3 Dec 2007 02:08:07 -0000 1.3
@@ -1 +1 @@
-cc0975e70fe1e704e16f2fb08c71cee2 paps-0.6.6.tar.gz
+e9508132bf27609bf2fded2bfd9cb3f1 paps-0.6.8.tar.gz
--- paps-0.6.6-cpilpi.patch DELETED ---
--- paps-0.6.6-encoding.patch DELETED ---
--- paps-0.6.6-font-option.patch DELETED ---
--- paps-0.6.6-lcctype.patch DELETED ---
--- paps-0.6.6-segfault.patch DELETED ---
--- paps-0.6.6-wordwrap.patch DELETED ---
--- paps-formfeed.patch DELETED ---
--- paps-makefile.patch DELETED ---
--- paps-typo-font-scale.patch DELETED ---
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|