diff --git a/.gitignore b/.gitignore index 6ce904f..2ad0286 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ gutenprint-5.2.2.tar.bz2 gutenprint-5.2.3.tar.bz2 gutenprint-5.2.4.tar.bz2 gutenprint-5.2.5.tar.bz2 +gutenprint-5.2.6.tar.bz2 diff --git a/gutenprint-brother-hl-2040.patch b/gutenprint-brother-hl-2040.patch index fe58957..7e10843 100644 --- a/gutenprint-brother-hl-2040.patch +++ b/gutenprint-brother-hl-2040.patch @@ -1,12 +1,12 @@ -diff -up gutenprint-5.2.4/src/xml/printers.xml.brother-hl-2040 gutenprint-5.2.4/src/xml/printers.xml ---- gutenprint-5.2.4/src/xml/printers.xml.brother-hl-2040 2009-10-28 11:32:31.144140897 +0000 -+++ gutenprint-5.2.4/src/xml/printers.xml 2009-10-28 11:33:08.490015268 +0000 -@@ -635,7 +635,7 @@ - - - -- -+ - - - +diff -up gutenprint-5.2.6/src/xml/printers.xml.brother-hl-2040 gutenprint-5.2.6/src/xml/printers.xml +--- gutenprint-5.2.6/src/xml/printers.xml.brother-hl-2040 2010-08-11 02:26:09.000000000 +0200 ++++ gutenprint-5.2.6/src/xml/printers.xml 2010-08-11 15:19:50.000000000 +0200 +@@ -706,7 +706,7 @@ + + + +- ++ + + + diff --git a/gutenprint-device-ids.patch b/gutenprint-device-ids.patch index 8b11051..58a557b 100644 --- a/gutenprint-device-ids.patch +++ b/gutenprint-device-ids.patch @@ -1,48 +1,48 @@ -diff -up gutenprint-5.2.5/src/xml/printers.xml.device-ids gutenprint-5.2.5/src/xml/printers.xml ---- gutenprint-5.2.5/src/xml/printers.xml.device-ids 2010-03-25 09:43:15.075221894 +0000 -+++ gutenprint-5.2.5/src/xml/printers.xml 2010-03-25 09:44:32.125096565 +0000 -@@ -305,7 +305,7 @@ - - - -- -+ - - - -@@ -321,7 +321,7 @@ - - - -- -+ - - - -@@ -329,7 +329,7 @@ - - - -- -+ - - - -@@ -436,7 +436,7 @@ - - - -- -+ - - - -@@ -904,7 +904,7 @@ - - - -- -+ - - - +diff -up gutenprint-5.2.6/src/xml/printers.xml.device-ids gutenprint-5.2.6/src/xml/printers.xml +--- gutenprint-5.2.6/src/xml/printers.xml.device-ids 2010-08-11 16:15:29.000000000 +0200 ++++ gutenprint-5.2.6/src/xml/printers.xml 2010-08-11 16:19:22.000000000 +0200 +@@ -311,7 +311,7 @@ + + + +- ++ + + + +@@ -327,7 +327,7 @@ + + + +- ++ + + + +@@ -337,7 +337,7 @@ + + + +- ++ + + + +@@ -449,7 +449,7 @@ + + + +- ++ + + + +@@ -925,7 +925,7 @@ + + + +- ++ + + + diff --git a/gutenprint-postscriptdriver.patch b/gutenprint-postscriptdriver.patch index ce682ba..ac7f920 100644 --- a/gutenprint-postscriptdriver.patch +++ b/gutenprint-postscriptdriver.patch @@ -1,6 +1,18 @@ -diff -up gutenprint-5.2.4/src/main/module.c.postscriptdriver gutenprint-5.2.4/src/main/module.c ---- gutenprint-5.2.4/src/main/module.c.postscriptdriver 2006-09-30 16:02:59.000000000 +0100 -+++ gutenprint-5.2.4/src/main/module.c 2010-02-05 10:01:18.668652991 +0000 +diff -up gutenprint-5.2.6/src/main/gutenprint-internal.h.postscriptdriver gutenprint-5.2.6/src/main/gutenprint-internal.h +--- gutenprint-5.2.6/src/main/gutenprint-internal.h.postscriptdriver 2010-08-04 02:33:56.000000000 +0200 ++++ gutenprint-5.2.6/src/main/gutenprint-internal.h 2010-08-11 16:11:19.000000000 +0200 +@@ -56,6 +56,8 @@ extern void stpi_init_printer(void); + #define BUFFER_FLAG_FLIP_X 0x1 + #define BUFFER_FLAG_FLIP_Y 0x2 + extern stp_image_t* stpi_buffer_image(stp_image_t* image, unsigned int flags); ++extern stp_list_t *stp_paths_copy_with_prefix(stp_list_t* list, ++ const char *prefix); + + #define STPI_ASSERT(x,v) \ + do \ +diff -up gutenprint-5.2.6/src/main/module.c.postscriptdriver gutenprint-5.2.6/src/main/module.c +--- gutenprint-5.2.6/src/main/module.c.postscriptdriver 2006-09-30 17:02:59.000000000 +0200 ++++ gutenprint-5.2.6/src/main/module.c 2010-08-11 16:13:43.000000000 +0200 @@ -151,12 +151,20 @@ int stp_module_load(void) } else @@ -22,9 +34,9 @@ diff -up gutenprint-5.2.4/src/main/module.c.postscriptdriver gutenprint-5.2.4/sr } #ifdef USE_LTDL file_list = stp_path_search(dir_list, ".la"); -diff -up gutenprint-5.2.4/src/main/path.c.postscriptdriver gutenprint-5.2.4/src/main/path.c ---- gutenprint-5.2.4/src/main/path.c.postscriptdriver 2008-06-01 15:41:18.000000000 +0100 -+++ gutenprint-5.2.4/src/main/path.c 2010-02-05 10:33:18.117778663 +0000 +diff -up gutenprint-5.2.6/src/main/path.c.postscriptdriver gutenprint-5.2.6/src/main/path.c +--- gutenprint-5.2.6/src/main/path.c.postscriptdriver 2008-06-01 16:41:18.000000000 +0200 ++++ gutenprint-5.2.6/src/main/path.c 2010-08-11 16:13:43.000000000 +0200 @@ -158,7 +158,17 @@ stpi_data_path(void) if (getenv("STP_DATA_PATH")) stp_path_split(dir_list, getenv("STP_DATA_PATH")); @@ -85,15 +97,3 @@ diff -up gutenprint-5.2.4/src/main/path.c.postscriptdriver gutenprint-5.2.4/src/ /* Adapted from GNU libc These macros extract size information from a `struct dirent *'. They may evaluate their argument multiple times, so it must not -diff -up gutenprint-5.2.4/src/main/util.h.postscriptdriver gutenprint-5.2.4/src/main/util.h ---- gutenprint-5.2.4/src/main/util.h.postscriptdriver 2007-02-24 21:49:22.000000000 +0000 -+++ gutenprint-5.2.4/src/main/util.h 2010-02-05 10:24:16.253778762 +0000 -@@ -61,6 +61,8 @@ extern void stpi_init_printer(void); - #define BUFFER_FLAG_FLIP_X 0x1 - #define BUFFER_FLAG_FLIP_Y 0x2 - extern stp_image_t* stpi_buffer_image(stp_image_t* image, unsigned int flags); -+extern stp_list_t *stp_paths_copy_with_prefix(stp_list_t* list, -+ const char *prefix); - - /** @} */ - diff --git a/gutenprint.spec b/gutenprint.spec index e899ce7..aa345e6 100644 --- a/gutenprint.spec +++ b/gutenprint.spec @@ -2,9 +2,9 @@ %define cups_serverbin %{_exec_prefix}/lib/cups Name: gutenprint -Summary: Printer Drivers Package -Version: 5.2.5 -Release: 10%{?dist} +Summary: Printer Drivers Package. +Version: 5.2.6 +Release: 1%{?dist} Group: System Environment/Base URL: http://gimp-print.sourceforge.net/ Source0: http://dl.sf.net/gimp-print/gutenprint-5.2/%{version}/gutenprint-%{version}.tar.bz2 @@ -291,6 +291,9 @@ fi /bin/rm -f /var/cache/foomatic/* %changelog +* Wed Aug 11 2010 Jiri Popelka 5.2.6-1 +- 5.2.6. + * Mon Jul 12 2010 Jiri Popelka 5.2.5-10 - Added COPYING file to main package. diff --git a/sources b/sources index 99f136f..845fd1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -10a0a9fac081d8116ec5ed47fbc1591c gutenprint-5.2.5.tar.bz2 +1f0d0cbef6c089f4f095e21869fa70db gutenprint-5.2.6.tar.bz2