diff --git a/cups-texttops-rotate-page.patch b/cups-texttops-rotate-page.patch new file mode 100644 index 0000000..2b048cd --- /dev/null +++ b/cups-texttops-rotate-page.patch @@ -0,0 +1,35 @@ +diff -up cups-1.4.3/filter/texttops.c.texttops-rotate-page cups-1.4.3/filter/texttops.c +--- cups-1.4.3/filter/texttops.c.texttops-rotate-page 2008-11-06 16:42:18.000000000 +0000 ++++ cups-1.4.3/filter/texttops.c 2010-05-18 16:42:23.669940884 +0100 +@@ -97,6 +97,13 @@ WritePage(void) + + puts("gsave"); + ++ /* If we're opereating in Landscape (Orientation == 1 or Orientation == 3) ++ then rotate and translate the page */ ++ if ( Orientation & 1 ) { ++ printf ("%d rotate\n", (Orientation & 3) * 90 ); ++ printf("0 %.0f neg translate\n", PageLength); ++ } ++ + if (PrettyPrint) + printf("%d H\n", NumPages); + +@@ -212,7 +219,7 @@ WriteProlog(const char *title, /* I - T + + puts("%!PS-Adobe-3.0"); + printf("%%%%BoundingBox: 0 0 %.0f %.0f\n", PageWidth, PageLength); +- printf("%%cupsRotation: %d\n", (Orientation & 3) * 90); ++ puts("%cupsRotation: 0"); + puts("%%Creator: texttops/" CUPS_SVERSION); + printf("%%%%CreationDate: %s\n", curdate); + WriteTextComment("Title", title); +@@ -549,6 +556,8 @@ WriteProlog(const char *title, /* I - T + puts("%%EndComments"); + + puts("%%BeginProlog"); ++ printf("%%%%Orientation: %s\n", ++ Orientation & 1 ? "Landscape" : "Portrait"); + + /* + * Download any missing fonts... diff --git a/cups.spec b/cups.spec index bdf8234..05238c1 100644 --- a/cups.spec +++ b/cups.spec @@ -9,7 +9,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.4.2 -Release: 30%{?dist} +Release: 31%{?dist} License: GPLv2 Group: System Environment/Daemons Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 @@ -81,6 +81,7 @@ Patch65: cups-EAI_AGAIN.patch Patch66: cups-str3505.patch Patch67: cups-CVE-2010-0302.patch Patch68: cups-str3541.patch +Patch69: cups-texttops-rotate-page.patch Patch100: cups-lspp.patch Epoch: 1 @@ -269,6 +270,7 @@ module. %patch66 -p1 -b .str3505 %patch67 -p1 -b .CVE-2010-0302 %patch68 -p1 -b .str3541 +%patch69 -p1 -b .texttops-rotate-page %if %lspp %patch100 -p1 -b .lspp @@ -560,6 +562,11 @@ rm -rf $RPM_BUILD_ROOT %{php_extdir}/phpcups.so %changelog +* Tue May 18 2010 Tim Waugh 1:1.4.2-31 +- Adjust texttops output to be in natural orientation (STR #3563). + This fixes page-label orientation when texttops is used in the + filter chain (bug #572338). + * Fri Apr 16 2010 Jiri Popelka 1:1.4.2-30 - Fixed str3541.patch - Added Require: ghostscript (bug #572701)