[gutenprint: 2/3] Merge branch 'f12' into f13
Jiří Popelka
jpopelka at fedoraproject.org
Wed Aug 11 15:21:22 UTC 2010
commit 4fe887e348893adc84f65fdd1489a57cdad939ee
Merge: 3a05ff0 18e826a
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Wed Aug 11 16:57:20 2010 +0200
Merge branch 'f12' into f13
.gitignore | 1 +
gutenprint-brother-hl-2040.patch | 24 +++++-----
gutenprint-device-ids.patch | 96 ++++++++++++++++++------------------
gutenprint-postscriptdriver.patch | 36 +++++++-------
gutenprint.spec | 9 ++-
sources | 2 +-
6 files changed, 86 insertions(+), 82 deletions(-)
---
diff --cc gutenprint-device-ids.patch
index 8b11051,0000000..58a557b
mode 100644,000000..100644
--- a/gutenprint-device-ids.patch
+++ b/gutenprint-device-ids.patch
@@@ -1,48 -1,0 +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 @@
- <printer translate="name" name="Epson Stylus Photo 820" deviceid="MFG:EPSON;MDL:Stylus Photo 820;DES:EPSON Stylus Photo 820;CMD:ESCPL2,BDC,D4;" driver="escp2-820" manufacturer="Epson" model="78" parameters="standard_params" />
- <printer translate="name" name="Epson Stylus Photo 825" deviceid="MFG:EPSON;MDL:Stylus Photo 825;DES:EPSON Stylus Photo 825;CMD:ESCPL2,BDC,D4;" driver="escp2-825" manufacturer="Epson" model="50" parameters="standard_params" />
- <printer translate="name" name="Epson Stylus Photo 830" deviceid="MFG:EPSON;MDL:Stylus Photo 830U;DES:EPSON Stylus Photo 830U;CMD:ESCPL2,BDC,D4;" driver="escp2-830" manufacturer="Epson" model="50" parameters="standard_params" />
- - <printer translate="name" name="Epson Stylus Photo 830U" driver="escp2-830u" manufacturer="Epson" model="50" parameters="standard_params" />
- + <printer translate="name" name="Epson Stylus Photo 830U" deviceid="MFG:EPSON;MDL:Stylus Photo 830U;DES:EPSON Stylus Photo 830U;CMD:ESCPL2,BDC,D4;" driver="escp2-830u" manufacturer="Epson" model="50" parameters="standard_params" />
- <printer translate="name" name="Epson Stylus Photo 870" deviceid="MFG:EPSON;MDL:Stylus Photo 870;DES:EPSON Stylus Photo 870;CMD:ESCPL2,BDC,D4;" driver="escp2-870" manufacturer="Epson" model="22" parameters="standard_params" />
- <printer translate="name" name="Epson Stylus Photo 875" driver="escp2-875" manufacturer="Epson" model="22" parameters="standard_params" />
- <printer translate="name" name="Epson Stylus Photo 890" deviceid="MFG:EPSON;MDL:Stylus Photo 890;DES:EPSON Stylus Photo 890;CMD:ESCPL2,BDC,D4;" driver="escp2-890" manufacturer="Epson" model="36" parameters="standard_params" />
- @@ -321,7 +321,7 @@
- <printer translate="name" name="Epson Stylus Photo 1280" driver="escp2-1280" manufacturer="Epson" model="37" parameters="standard_params" />
- <printer translate="name" name="Epson Stylus Photo 1290" driver="escp2-1290" manufacturer="Epson" model="37" parameters="standard_params" />
- <printer translate="name" name="Epson Stylus Photo 1290s" driver="escp2-1290s" manufacturer="Epson" model="37" parameters="standard_params" />
- - <printer translate="name" name="Epson Stylus Photo 1400" driver="escp2-1400" manufacturer="Epson" model="82" parameters="claria_params" />
- + <printer translate="name" name="Epson Stylus Photo 1400" deviceid="MFG:EPSON;MDL:Stylus Photo 1400;DES:EPSON Stylus Photo 1400;CMD:ESCPL2,BDC,D4,D4PX,ESCPR1;" driver="escp2-1400" manufacturer="Epson" model="82" parameters="claria_params" />
- <printer translate="name" name="Epson Stylus Photo 1410" driver="escp2-1410" manufacturer="Epson" model="82" parameters="claria_params" />
- <printer translate="name" name="Epson Stylus Photo 2000P" driver="escp2-2000" manufacturer="Epson" model="26" parameters="standard_params" />
- <printer translate="name" name="Epson Stylus Photo 2100" driver="escp2-2100" manufacturer="Epson" model="47" parameters="standard_params" />
- @@ -329,7 +329,7 @@
- <printer translate="name" name="Epson Stylus Photo R200" deviceid="MFG:EPSON;MDL:Stylus Photo R200;DES:EPSON Stylus Photo R200;CMD:ESCPL2,BDC,D4;" driver="escp2-r200" manufacturer="Epson" model="63" parameters="standard_params" />
- <printer translate="name" name="Epson Stylus Photo R210" deviceid="MFG:EPSON;MDL:Stylus Photo R210;DES:EPSON Stylus Photo R210;CMD:ESCPL2,BDC,D4;" driver="escp2-r210" manufacturer="Epson" model="63" parameters="standard_params" />
- <printer translate="name" name="Epson Stylus Photo R220" deviceid="MFG:EPSON;MDL:Stylus Photo R220;DES:EPSON Stylus Photo R220;CMD:ESCPL2,BDC,D4;" driver="escp2-r220" manufacturer="Epson" model="84" parameters="standard_params" />
- - <printer translate="name" name="Epson Stylus Photo R230" driver="escp2-r230" manufacturer="Epson" model="84" parameters="standard_params" />
- + <printer translate="name" name="Epson Stylus Photo R230" deviceid="MFG:EPSON;MDL:Stylus Photo R230;" driver="escp2-r230" manufacturer="Epson" model="84" parameters="standard_params" />
- <printer translate="name" name="Epson Stylus Photo R240" driver="escp2-r240" manufacturer="Epson" model="83" parameters="standard_params" />
- <printer translate="name" name="Epson Stylus Photo R245" driver="escp2-r245" manufacturer="Epson" model="83" parameters="standard_params" />
- <printer translate="name" name="Epson Stylus Photo R260" driver="escp2-r260" manufacturer="Epson" model="81" parameters="claria_params" />
- @@ -436,7 +436,7 @@
- <printer translate="name" name="Epson Stylus CX9475F" driver="escp2-cx9475f" manufacturer="Epson" model="65" parameters="cx3500_params" />
- <printer translate="name" name="Epson Stylus D68" deviceid="MFG:EPSON;MDL:Stylus D68;DES:EPSON Stylus D68;CMD:ESCPL2,BDC,D4;" driver="escp2-d68" manufacturer="Epson" model="66" parameters="standard_params" />
- <printer translate="name" name="Epson Stylus D88" deviceid="MFG:EPSON;MDL:Stylus D88;DES:EPSON Stylus D88;CMD:ESCPL2,BDC,D4;" driver="escp2-d88" manufacturer="Epson" model="69" parameters="standard_params" />
- - <printer translate="name" name="Epson Stylus D92" driver="escp2-d92" manufacturer="Epson" model="66" parameters="standard_params" />
- + <printer translate="name" name="Epson Stylus D92" deviceid="MFG:EPSON;CMD:ESCPL2,BDC,D4,D4PX;MDL:Stylus D92;DES:EPSON Stylus D92;" driver="escp2-d92" manufacturer="Epson" model="66" parameters="standard_params" />
- <printer translate="name" name="Epson Stylus D120" driver="escp2-d120" manufacturer="Epson" model="85" parameters="standard_params" />
- <printer translate="name" name="Epson Stylus DX3800" deviceid="MFG:EPSON;MDL:Stylus DX3800;DES:EPSON Stylus DX3800;CMD:ESCPL2,BDC,D4;" driver="escp2-dx3800" manufacturer="Epson" model="72" parameters="standard_params" />
- <printer translate="name" name="Epson Stylus DX3850" deviceid="MFG:EPSON;MDL:Stylus DX3850;DES:EPSON Stylus DX3850;CMD:ESCPL2,BDC,D4;" driver="escp2-dx3850" manufacturer="Epson" model="72" parameters="standard_params" />
- @@ -904,7 +904,7 @@
- <printer translate="name" name="HP DeskJet 952C" driver="hp-dj_952c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
- <printer translate="name" name="HP DeskJet 955C" driver="hp-dj_955c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
- <printer translate="name" name="HP DeskJet 957C" driver="hp-dj_957c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
- - <printer translate="name" name="HP DeskJet 959C" driver="hp-dj_959c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
- + <printer translate="name" name="HP DeskJet 959C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 950C;DES:Hewlett-Packard DeskJet 950C;CMD:MLC,PCL,PML;" driver="hp-dj_959c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
- <printer translate="name" name="HP DeskJet 960C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 960C;DES:Hewlett-Packard DeskJet 960C;CMD:MLC,PCL,PML;" driver="hp-dj_960c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
- <printer translate="name" name="HP DeskJet 970C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 970C;DES:Hewlett-Packard DeskJet 970C;CMD:MLC,PCL,PML;" driver="hp-dj_970c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
- <printer translate="name" name="HP DeskJet 975C" driver="hp-dj_975c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
++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 @@
++ <printer translate="name" name="Epson Stylus Photo 820" deviceid="MFG:EPSON;MDL:Stylus Photo 820;DES:EPSON Stylus Photo 820;CMD:ESCPL2,BDC,D4;" driver="escp2-820" manufacturer="Epson" model="78" parameters="standard_params" foomaticid="Epson-Stylus_Photo_820" />
++ <printer translate="name" name="Epson Stylus Photo 825" deviceid="MFG:EPSON;MDL:Stylus Photo 825;DES:EPSON Stylus Photo 825;CMD:ESCPL2,BDC,D4;" driver="escp2-825" manufacturer="Epson" model="50" parameters="standard_params" foomaticid="Epson-Stylus_Photo_825" />
++ <printer translate="name" name="Epson Stylus Photo 830" deviceid="MFG:EPSON;MDL:Stylus Photo 830U;DES:EPSON Stylus Photo 830U;CMD:ESCPL2,BDC,D4;" driver="escp2-830" manufacturer="Epson" model="50" parameters="standard_params" foomaticid="Epson-Stylus_Photo_830" />
++- <printer translate="name" name="Epson Stylus Photo 830U" driver="escp2-830u" manufacturer="Epson" model="50" parameters="standard_params" foomaticid="Epson-Stylus_Photo_830U" />
+++ <printer translate="name" name="Epson Stylus Photo 830U" deviceid="MFG:EPSON;MDL:Stylus Photo 830U;DES:EPSON Stylus Photo 830U;CMD:ESCPL2,BDC,D4;" driver="escp2-830u" manufacturer="Epson" model="50" parameters="standard_params" foomaticid="Epson-Stylus_Photo_830U" />
++ <printer translate="name" name="Epson Stylus Photo 870" deviceid="MFG:EPSON;MDL:Stylus Photo 870;DES:EPSON Stylus Photo 870;CMD:ESCPL2,BDC,D4;" driver="escp2-870" manufacturer="Epson" model="22" parameters="standard_params" foomaticid="Epson-Stylus_Photo_870" />
++ <printer translate="name" name="Epson Stylus Photo 875" driver="escp2-875" manufacturer="Epson" model="22" parameters="standard_params" foomaticid="Epson-Stylus_Photo_875" />
++ <printer translate="name" name="Epson Stylus Photo 890" deviceid="MFG:EPSON;MDL:Stylus Photo 890;DES:EPSON Stylus Photo 890;CMD:ESCPL2,BDC,D4;" driver="escp2-890" manufacturer="Epson" model="36" parameters="standard_params" foomaticid="Epson-Stylus_Photo_890" />
++@@ -327,7 +327,7 @@
++ <printer translate="name" name="Epson Stylus Photo 1280" driver="escp2-1280" manufacturer="Epson" model="37" parameters="standard_params" foomaticid="Epson-Stylus_Photo_1280" />
++ <printer translate="name" name="Epson Stylus Photo 1290" driver="escp2-1290" manufacturer="Epson" model="37" parameters="standard_params" foomaticid="Epson-Stylus_Photo_1290" />
++ <printer translate="name" name="Epson Stylus Photo 1290s" driver="escp2-1290s" manufacturer="Epson" model="37" parameters="standard_params" foomaticid="Epson-Stylus_Photo_1290s" />
++- <printer translate="name" name="Epson Stylus Photo 1400" driver="escp2-1400" manufacturer="Epson" model="82" parameters="claria_params" foomaticid="Epson-Stylus_Photo_1400" />
+++ <printer translate="name" name="Epson Stylus Photo 1400" deviceid="MFG:EPSON;MDL:Stylus Photo 1400;DES:EPSON Stylus Photo 1400;CMD:ESCPL2,BDC,D4,D4PX,ESCPR1;" driver="escp2-1400" manufacturer="Epson" model="82" parameters="claria_params" foomaticid="Epson-Stylus_Photo_1400" />
++ <printer translate="name" name="Epson Stylus Photo 1410" driver="escp2-1410" manufacturer="Epson" model="82" parameters="claria_params" foomaticid="Epson-Stylus_Photo_1410" />
++ <printer translate="name" name="Epson Stylus Photo 2000P" driver="escp2-2000" manufacturer="Epson" model="26" parameters="standard_params" foomaticid="Epson-Stylus_Photo_2000P" />
++ <printer translate="name" name="Epson Stylus Photo 2100" driver="escp2-2100" manufacturer="Epson" model="47" parameters="standard_params" foomaticid="Epson-Stylus_Photo_2100" />
++@@ -337,7 +337,7 @@
++ <printer translate="name" name="Epson Stylus Photo R200" deviceid="MFG:EPSON;MDL:Stylus Photo R200;DES:EPSON Stylus Photo R200;CMD:ESCPL2,BDC,D4;" driver="escp2-r200" manufacturer="Epson" model="63" parameters="standard_params" foomaticid="Epson-Stylus_Photo_R200" />
++ <printer translate="name" name="Epson Stylus Photo R210" deviceid="MFG:EPSON;MDL:Stylus Photo R210;DES:EPSON Stylus Photo R210;CMD:ESCPL2,BDC,D4;" driver="escp2-r210" manufacturer="Epson" model="63" parameters="standard_params" foomaticid="Epson-Stylus_Photo_R210" />
++ <printer translate="name" name="Epson Stylus Photo R220" deviceid="MFG:EPSON;MDL:Stylus Photo R220;DES:EPSON Stylus Photo R220;CMD:ESCPL2,BDC,D4;" driver="escp2-r220" manufacturer="Epson" model="84" parameters="standard_params" foomaticid="Epson-Stylus_Photo_R220" />
++- <printer translate="name" name="Epson Stylus Photo R230" driver="escp2-r230" manufacturer="Epson" model="84" parameters="standard_params" foomaticid="Epson-Stylus_Photo_R230" />
+++ <printer translate="name" name="Epson Stylus Photo R230" deviceid="MFG:EPSON;MDL:Stylus Photo R230;" driver="escp2-r230" manufacturer="Epson" model="84" parameters="standard_params" foomaticid="Epson-Stylus_Photo_R230" />
++ <printer translate="name" name="Epson Stylus Photo R240" driver="escp2-r240" manufacturer="Epson" model="83" parameters="standard_params" foomaticid="Epson-Stylus_Photo_R240" />
++ <printer translate="name" name="Epson Stylus Photo R245" driver="escp2-r245" manufacturer="Epson" model="83" parameters="standard_params" foomaticid="Epson-Stylus_Photo_R245" />
++ <printer translate="name" name="Epson Stylus Photo R260" driver="escp2-r260" manufacturer="Epson" model="81" parameters="claria_params" foomaticid="Epson-Stylus_Photo_R260" />
++@@ -449,7 +449,7 @@
++ <printer translate="name" name="Epson Stylus CX9475F" driver="escp2-cx9475f" manufacturer="Epson" model="65" parameters="cx3500_params" foomaticid="Epson-Stylus_CX9475F" />
++ <printer translate="name" name="Epson Stylus D68" deviceid="MFG:EPSON;MDL:Stylus D68;DES:EPSON Stylus D68;CMD:ESCPL2,BDC,D4;" driver="escp2-d68" manufacturer="Epson" model="66" parameters="standard_params" foomaticid="Epson-Stylus_D68" />
++ <printer translate="name" name="Epson Stylus D88" deviceid="MFG:EPSON;MDL:Stylus D88;DES:EPSON Stylus D88;CMD:ESCPL2,BDC,D4;" driver="escp2-d88" manufacturer="Epson" model="69" parameters="standard_params" foomaticid="Epson-Stylus_D88" />
++- <printer translate="name" name="Epson Stylus D92" driver="escp2-d92" manufacturer="Epson" model="66" parameters="standard_params" foomaticid="Epson-Stylus_D92" />
+++ <printer translate="name" name="Epson Stylus D92" deviceid="MFG:EPSON;CMD:ESCPL2,BDC,D4,D4PX;MDL:Stylus D92;DES:EPSON Stylus D92;" driver="escp2-d92" manufacturer="Epson" model="66" parameters="standard_params" foomaticid="Epson-Stylus_D92" />
++ <printer translate="name" name="Epson Stylus D120" driver="escp2-d120" manufacturer="Epson" model="85" parameters="standard_params" foomaticid="Epson-Stylus_D120" />
++ <printer translate="name" name="Epson Stylus DX3800" deviceid="MFG:EPSON;MDL:Stylus DX3800;DES:EPSON Stylus DX3800;CMD:ESCPL2,BDC,D4;" driver="escp2-dx3800" manufacturer="Epson" model="72" parameters="standard_params" foomaticid="Epson-Stylus_DX3800" />
++ <printer translate="name" name="Epson Stylus DX3850" deviceid="MFG:EPSON;MDL:Stylus DX3850;DES:EPSON Stylus DX3850;CMD:ESCPL2,BDC,D4;" driver="escp2-dx3850" manufacturer="Epson" model="72" parameters="standard_params" foomaticid="Epson-Stylus_DX3850" />
++@@ -925,7 +925,7 @@
++ <printer translate="name" name="HP DeskJet 952C" driver="hp-dj_952c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" foomaticid="HP-DeskJet_952C" />
++ <printer translate="name" name="HP DeskJet 955C" driver="hp-dj_955c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" foomaticid="HP-DeskJet_955C" />
++ <printer translate="name" name="HP DeskJet 957C" driver="hp-dj_957c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" foomaticid="HP-DeskJet_957C" />
++- <printer translate="name" name="HP DeskJet 959C" driver="hp-dj_959c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" foomaticid="HP-DeskJet_959C" />
+++ <printer translate="name" name="HP DeskJet 959C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 950C;DES:Hewlett-Packard DeskJet 950C;CMD:MLC,PCL,PML;" driver="hp-dj_959c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" foomaticid="HP-DeskJet_959C" />
++ <printer translate="name" name="HP DeskJet 960C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 960C;DES:Hewlett-Packard DeskJet 960C;CMD:MLC,PCL,PML;" driver="hp-dj_960c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" foomaticid="HP-DeskJet_960C" />
++ <printer translate="name" name="HP DeskJet 970C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 970C;DES:Hewlett-Packard DeskJet 970C;CMD:MLC,PCL,PML;" driver="hp-dj_970c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" foomaticid="HP-DeskJet_970C" />
++ <printer translate="name" name="HP DeskJet 975C" driver="hp-dj_975c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" foomaticid="HP-DeskJet_975C" />
diff --cc gutenprint-postscriptdriver.patch
index ce682ba,0000000..ac7f920
mode 100644,000000..100644
--- a/gutenprint-postscriptdriver.patch
+++ b/gutenprint-postscriptdriver.patch
@@@ -1,99 -1,0 +1,99 @@@
- 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
+ {
++ const char *prefix = getenv("DESTDIR");
+ #ifdef USE_LTDL
+ stp_path_split(dir_list, getenv("LTDL_LIBRARY_PATH"));
+ stp_path_split(dir_list, lt_dlgetsearchpath());
+ #else
+ stp_path_split(dir_list, PKGMODULEDIR);
+ #endif
++ if (prefix)
++ {
++ stp_list_t *prefix_list;
++ prefix_list = stp_paths_copy_with_prefix(dir_list, prefix);
++ stp_list_destroy(dir_list);
++ dir_list = prefix_list;
++ }
+ }
+ #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"));
+ else
+- stp_path_split(dir_list, PKGXMLDATADIR);
++ {
++ const char *prefix = getenv("DESTDIR");
++ stp_path_split(dir_list, PKGXMLDATADIR);
++ if (prefix)
++ {
++ stp_list_t *prefix_list;
++ prefix_list = stp_paths_copy_with_prefix(dir_list, prefix);
++ stp_list_destroy(dir_list);
++ dir_list = prefix_list;
++ }
++ }
+ return dir_list;
+ }
+
+@@ -226,6 +236,40 @@ stp_path_split(stp_list_t *list, /* List
+ }
+ }
+
++/*
++ * Split a PATH-type string (colon-delimited) into separate
++ * directories.
++ */
++stp_list_t *
++stp_paths_copy_with_prefix(stp_list_t *list, /* List to add prefix to */
++ const char *prefix) /* Prefix to add */
++{
++ stp_list_t *new_list;
++ stp_list_item_t *item;
++ int prefixlen = strlen (prefix);
++ if (!(new_list = stp_list_create()))
++ return;
++
++ item = stp_list_get_start (list);
++ while (item)
++ {
++ const char *data;
++ char *new_data;
++ int len;
++ data = stp_list_item_get_data (item);
++ len = strlen (data);
++ new_data = (char *) stp_malloc(prefixlen + 1 + len + 1);
++ strncpy(new_data, prefix, prefixlen);
++ new_data[prefixlen] = '/';
++ strcpy(new_data + prefixlen + 1, data);
++ stp_list_item_create(new_list, NULL, new_data);
++
++ item = stp_list_item_next (item);
++ }
++
++ return new_list;
++}
++
+ /* Adapted from GNU libc <dirent.h>
+ 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 --cc gutenprint.spec
index e899ce7,67dba58..aa345e6
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@@ -2,15 -2,13 +2,15 @@@
%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-%{version}.tar.bz2
+Source0: http://dl.sf.net/gimp-print/gutenprint-5.2/%{version}/gutenprint-%{version}.tar.bz2
+# Post-install script to update foomatic PPDs.
Source1: gutenprint-foomaticppdupdate
+# Post-install script to update CUPS native PPDs.
Source2: cups-genppdupdate.py.in
Patch0: gutenprint-menu.patch
Patch1: gutenprint-O6.patch
@@@ -291,47 -267,15 +291,50 @@@ f
/bin/rm -f /var/cache/foomatic/*
%changelog
+ * Wed Aug 11 2010 Jiri Popelka <jpopelka at redhat.com> 5.2.6-1
+ - 5.2.6.
+
-* Fri Feb 12 2010 Tim Waugh <twaugh at redhat.com> 5.2.5-2
-- Bump release.
+* Mon Jul 12 2010 Jiri Popelka <jpopelka at redhat.com> 5.2.5-10
+- Added COPYING file to main package.
-* Fri Feb 12 2010 Tim Waugh <twaugh at redhat.com> 5.2.5-1
+* Thu Jul 8 2010 Jiri Popelka <jpopelka at redhat.com> 5.2.5-9
+- Don't ship kitload.log in foomatic sub-package (bug #594709).
+
+* Fri Jun 11 2010 Tim Waugh <twaugh at redhat.com> 5.2.5-8
+- Fixed Source0 URL.
+
+* Wed May 12 2010 Jiri Popelka <jpopelka at redhat.com> 5.2.5-7
+- Added IEEE 1284 Device ID for:
+ Epson Stylus Photo 1400 (bug #577299).
+ Epson Stylus Photo 830U (bug #577307).
+ HP DeskJet 959C (bug #577291).
+
+* Thu Mar 25 2010 Tim Waugh <twaugh at redhat.com> 5.2.5-6
+- Added IEEE 1284 Device ID for Epson Stylus Photo R230 (from Ubuntu #520466).
+
+* Mon Mar 8 2010 Tim Waugh <twaugh at redhat.com> 5.2.5-5
+- Added IEEE 1284 Device ID for Epson Stylus D92 (bug #570888).
+
+* Tue Mar 2 2010 Tim Waugh <twaugh at redhat.com> 5.2.5-4
+- Better defattr use in file manifests.
+- Fixed mixed spaces and tabs.
+- Fixed main package summary.
+- Added comments for all sources and patches.
+
+* Mon Feb 15 2010 Tim Waugh <twaugh at redhat.com> 5.2.5-3
+- The cups sub-package requires the exactly-matching main gutenprint
+ package.
+
+* Fri Feb 12 2010 Tim Waugh <twaugh at redhat.com> 5.2.5-2
- 5.2.5.
+* Fri Feb 5 2010 Tim Waugh <twaugh at redhat.com> 5.2.4-11
+- CUPS driver: if DESTDIR is set, use it when looking for XML files.
+ Fixes postscriptdriver tags.
+
+* Thu Feb 4 2010 Tim Waugh <twaugh at redhat.com> 5.2.4-10
+- Rebuild for postscriptdriver tags.
+
* Wed Nov 25 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-9
- The foomatic sub-package requires foomatic-db (for directories).
More information about the scm-commits
mailing list