Merge branch 'f14'

.gitignore

@@ -44,3 +44,4 @@ cups-1.4b2-svn8404-source.tar.bz2
 cups-1.4.3-source.tar.bz2
 cups-1.4.4-source.tar.bz2
 /cups-1.4.5-source.tar.bz2
+/cups-1.4.6-source.tar.bz2

cups-page-label.patch

@@ -1,6 +1,6 @@
-diff -up cups-1.4.5/filter/pstops.c.page-label cups-1.4.5/filter/pstops.c
---- cups-1.4.5/filter/pstops.c.page-label	2010-08-31 20:36:08.000000000 +0200
-+++ cups-1.4.5/filter/pstops.c	2010-11-12 13:11:11.000000000 +0100
+diff -up cups-1.4.4/filter/pstops.c.page-label cups-1.4.4/filter/pstops.c
+--- cups-1.4.4/filter/pstops.c.page-label	2010-03-30 23:07:33.000000000 +0100
++++ cups-1.4.4/filter/pstops.c	2010-06-18 09:36:18.239126341 +0100
 @@ -108,6 +108,7 @@ typedef struct				/**** Document informa
    int		num_options;		/* Number of document-wide options */
    cups_option_t	*options;		/* Document-wide options */
@@ -77,8 +77,8 @@ diff -up cups-1.4.5/filter/pstops.c.page-label cups-1.4.5/filter/pstops.c
            doc_puts(doc, "ESPshowpage\n");
  	}
          break;
-@@ -2433,6 +2457,12 @@ set_pstops_options(
-     Orientation = 0;
+@@ -2420,6 +2444,12 @@ set_pstops_options(
+   doc->new_bounding_box[3] = INT_MIN;
  
   /*
 +  * Save original orientation of the document

cups.spec

@@ -7,8 +7,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.4.5
-Release: 10%{?dist}
+Version: 1.4.6
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -599,6 +599,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Jan 07 2011 Jiri Popelka <jpopelka@redhat.com> 1:1.4.6-1
+- 1.4.6.
+
 * Fri Dec 31 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.5-10
 - Some Avahi support fixes from Till Kamppeter.
 

sources

@@ -1 +1 @@
-50729f6fc46ba54223e0eaf5009f3419  cups-1.4.5-source.tar.bz2
+de8fb5a29c36554925c0c6a6e2c0dae1  cups-1.4.6-source.tar.bz2