5:29 p.m.
Author: dwmw2
Update of /cvs/free/rpms/foo2zjs/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7348
Modified Files:
.cvsignore foo2zjs-dynamic-jbig.patch foo2zjs.spec sources
Added Files:
foo2zjs-device-ids.patch
Log Message:
Update to current release
foo2zjs-device-ids.patch:
PPD/Minolta-magicolor_2300_DL.ppd | 1 +
PPD/Minolta-magicolor_2430_DL.ppd | 1 +
foomatic-db/printer/Minolta-magicolor_2300_DL.xml | 9 +++++++++
foomatic-db/printer/Minolta-magicolor_2430_DL.xml | 9 +++++++++
4 files changed, 20 insertions(+)
--- NEW FILE foo2zjs-device-ids.patch ---
diff -urp foo2zjs-20110909/PPD/Minolta-magicolor_2300_DL.ppd
foo2zjs/PPD/Minolta-magicolor_2300_DL.ppd
--- foo2zjs-20110909/PPD/Minolta-magicolor_2300_DL.ppd 2011-08-11 19:02:05.000000000
+0100
+++ foo2zjs/PPD/Minolta-magicolor_2300_DL.ppd 2011-10-05 17:17:13.099143311 +0100
@@ -52,6 +52,7 @@
*Throughput: "1"
*LandscapeOrientation: Plus90
*TTRasterizer: Type42
+*1284DeviceID: "MANUFACTURER:KONICA MINOLTA;MODEL:magicolor 2300 DL;COMMAND
SET:ZJS,PJL;DRV:Dfoo2zjs,R1,M0,TF;"
*1284DeviceID: "MANUFACTURER:MINOLTA-QMS;MODEL:magicolor 2300 DL;COMMAND
SET:ZJS,PJL;DRV:Dfoo2zjs,R1,M0,TF;"
*driverName foo2zjs/foo2zjs: ""
diff -urp foo2zjs-20110909/PPD/Minolta-magicolor_2430_DL.ppd
foo2zjs/PPD/Minolta-magicolor_2430_DL.ppd
--- foo2zjs-20110909/PPD/Minolta-magicolor_2430_DL.ppd 2011-08-11 19:02:05.000000000
+0100
+++ foo2zjs/PPD/Minolta-magicolor_2430_DL.ppd 2011-10-05 17:16:55.944434987 +0100
@@ -52,6 +52,7 @@
*Throughput: "1"
*LandscapeOrientation: Plus90
*TTRasterizer: Type42
+*1284DeviceID: "MANUFACTURER:KONICA MINOLTA;MODEL:magicolor 2430 DL;COMMAND
SET:ZJS,PJL;DRV:Dfoo2zjs,R1,M0,TF;"
*1284DeviceID: "MANUFACTURER:MINOLTA-QMS;MODEL:magicolor 2430 DL;COMMAND
SET:ZJS,PJL;DRV:Dfoo2zjs,R1,M0,TF;"
*driverName foo2zjs/foo2zjs: ""
diff -ur foo2zjs-20110909/foomatic-db/printer/Minolta-magicolor_2300_DL.xml
foo2zjs/foomatic-db/printer/Minolta-magicolor_2300_DL.xml
--- foo2zjs-20110909/foomatic-db/printer/Minolta-magicolor_2300_DL.xml 2006-06-08
04:29:27.000000000 +0100
+++ foo2zjs/foomatic-db/printer/Minolta-magicolor_2300_DL.xml 2011-10-05
17:45:15.920530818 +0100
@@ -48,9 +48,18 @@
<model>magicolor 2300 DL</model>
<commandset>ZJS,PJL</commandset>
</parallel>
+ <parallel>
+ <ieee1284>CLASS:PRINTER;MODEL:magicolor 2300 DL;MANUFACTURER:KONICA
MINOLTA;COMMAND SET:ZJS,PJL;</ieee1284>
+ <manufacturer>KONICA MINOLTA</manufacturer>
+ <model>magicolor 2300 DL</model>
+ <commandset>ZJS,PJL</commandset>
+ </parallel>
<snmp>
<description>MINOLTA-QMS magicolor 2300 DL</description>
</snmp>
+ <snmp>
+ <description>KONICA MINOLTA magicolor 2300 DL</description>
+ </snmp>
</autodetect>
<functionality>B</functionality>
<driver>foo2zjs</driver>
diff -ur foo2zjs-20110909/foomatic-db/printer/Minolta-magicolor_2430_DL.xml
foo2zjs/foomatic-db/printer/Minolta-magicolor_2430_DL.xml
--- foo2zjs-20110909/foomatic-db/printer/Minolta-magicolor_2430_DL.xml 2006-06-08
04:29:42.000000000 +0100
+++ foo2zjs/foomatic-db/printer/Minolta-magicolor_2430_DL.xml 2011-10-05
17:44:37.527183609 +0100
@@ -46,9 +46,18 @@
<model>magicolor 2430 DL</model>
<commandset>ZJS,PJL</commandset>
</parallel>
+ <parallel>
+ <ieee1284>CLASS:PRINTER;MODEL:magicolor 2430 DL;MANUFACTURER:KONICA
MINOLTA;COMMAND SET:ZJS,PJL;</ieee1284>
+ <manufacturer>KONICA MINOLTA</manufacturer>
+ <model>magicolor 2430 DL</model>
+ <commandset>ZJS,PJL</commandset>
+ </parallel>
<snmp>
<description>MINOLTA-QMS magicolor 2430 DL</description>
</snmp>
+ <snmp>
+ <description>KONICA MINOLTA magicolor 2430 DL</description>
+ </snmp>
</autodetect>
<functionality>B</functionality>
<driver>foo2zjs</driver>
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 19 Apr 2010 11:55:16 -0000 1.5
+++ .cvsignore 5 Oct 2011 17:29:48 -0000 1.6
@@ -1 +1 @@
-foo2zjs-20100413.tar.gz
+foo2zjs-20110909.tar.gz
foo2zjs-dynamic-jbig.patch:
Makefile | 93 -
jbig.c | 3289 --------------------------------------------------------------
jbig.h | 233 ----
jbig_ar.c | 426 --------
jbig_ar.h | 55 -
5 files changed, 44 insertions(+), 4052 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 foo2zjs-dynamic-jbig.patch
Index: foo2zjs-dynamic-jbig.patch
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/devel/foo2zjs-dynamic-jbig.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- foo2zjs-dynamic-jbig.patch 8 Nov 2009 23:19:07 -0000 1.3
+++ foo2zjs-dynamic-jbig.patch 5 Oct 2011 17:29:49 -0000 1.4
@@ -1,7 +1,4043 @@
-diff -uNr foo2zjs-20091106/Makefile foo2zjs/Makefile
---- foo2zjs-20091106/Makefile 2009-10-21 19:41:50.000000000 +0100
-+++ foo2zjs/Makefile 2009-11-08 22:56:20.000000000 +0000
-@@ -123,10 +123,6 @@
+diff -uNrP foo2zjs-20110909/jbig_ar.c foo2zjs/jbig_ar.c
+--- foo2zjs-20110909/jbig_ar.c 2008-09-05 16:05:54.000000000 +0100
++++ foo2zjs/jbig_ar.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,426 +0,0 @@
+-/*
+- * Arithmetic encoder and decoder of the portable JBIG
+- * compression library
+- *
+- * Markus Kuhn -- http://www.cl.cam.ac.uk/~mgk25/jbigkit/
+- *
+- * This module implements a portable standard C arithmetic encoder
+- * and decoder used by the JBIG lossless bi-level image compression
+- * algorithm as specified in International Standard ISO 11544:1993
+- * and ITU-T Recommendation T.82.
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- *
+- * If you want to use this program under different license conditions,
+- * then contact the author for an arrangement.
+- *
+- * It is possible that certain products which can be built using this
+- * software module might form inventions protected by patent rights in
+- * some countries (e.g., by patents about arithmetic coding algorithms
+- * owned by IBM and AT&T in the USA). Provision of this software by the
+- * author does NOT include any licences for any patents. In those
+- * countries where a patent licence is required for certain applications
+- * of this software module, you will have to obtain such a licence
+- * yourself.
+- */
+-
+-#include <assert.h>
+-#include "jbig_ar.h"
+-
+-/*
+- * Probability estimation tables for the arithmetic encoder/decoder
+- * given by ITU T.82 Table 24.
+- */
+-
+-static short lsztab[113] = {
+- 0x5a1d, 0x2586, 0x1114, 0x080b, 0x03d8, 0x01da, 0x00e5, 0x006f,
+- 0x0036, 0x001a, 0x000d, 0x0006, 0x0003, 0x0001, 0x5a7f, 0x3f25,
+- 0x2cf2, 0x207c, 0x17b9, 0x1182, 0x0cef, 0x09a1, 0x072f, 0x055c,
+- 0x0406, 0x0303, 0x0240, 0x01b1, 0x0144, 0x00f5, 0x00b7, 0x008a,
+- 0x0068, 0x004e, 0x003b, 0x002c, 0x5ae1, 0x484c, 0x3a0d, 0x2ef1,
+- 0x261f, 0x1f33, 0x19a8, 0x1518, 0x1177, 0x0e74, 0x0bfb, 0x09f8,
+- 0x0861, 0x0706, 0x05cd, 0x04de, 0x040f, 0x0363, 0x02d4, 0x025c,
+- 0x01f8, 0x01a4, 0x0160, 0x0125, 0x00f6, 0x00cb, 0x00ab, 0x008f,
+- 0x5b12, 0x4d04, 0x412c, 0x37d8, 0x2fe8, 0x293c, 0x2379, 0x1edf,
+- 0x1aa9, 0x174e, 0x1424, 0x119c, 0x0f6b, 0x0d51, 0x0bb6, 0x0a40,
+- 0x5832, 0x4d1c, 0x438e, 0x3bdd, 0x34ee, 0x2eae, 0x299a, 0x2516,
+- 0x5570, 0x4ca9, 0x44d9, 0x3e22, 0x3824, 0x32b4, 0x2e17, 0x56a8,
+- 0x4f46, 0x47e5, 0x41cf, 0x3c3d, 0x375e, 0x5231, 0x4c0f, 0x4639,
+- 0x415e, 0x5627, 0x50e7, 0x4b85, 0x5597, 0x504f, 0x5a10, 0x5522,
+- 0x59eb
+-};
+-
+-static unsigned char nmpstab[113] = {
+- 1, 2, 3, 4, 5, 6, 7, 8,
+- 9, 10, 11, 12, 13, 13, 15, 16,
+- 17, 18, 19, 20, 21, 22, 23, 24,
+- 25, 26, 27, 28, 29, 30, 31, 32,
+- 33, 34, 35, 9, 37, 38, 39, 40,
+- 41, 42, 43, 44, 45, 46, 47, 48,
+- 49, 50, 51, 52, 53, 54, 55, 56,
+- 57, 58, 59, 60, 61, 62, 63, 32,
+- 65, 66, 67, 68, 69, 70, 71, 72,
+- 73, 74, 75, 76, 77, 78, 79, 48,
+- 81, 82, 83, 84, 85, 86, 87, 71,
+- 89, 90, 91, 92, 93, 94, 86, 96,
+- 97, 98, 99, 100, 93, 102, 103, 104,
+- 99, 106, 107, 103, 109, 107, 111, 109,
+- 111
+-};
+-
+-/*
+- * least significant 7 bits (mask 0x7f) of nlpstab[] contain NLPS value,
+- * most significant bit (mask 0x80) contains SWTCH bit
+- */
+-static unsigned char nlpstab[113] = {
+- 129, 14, 16, 18, 20, 23, 25, 28,
+- 30, 33, 35, 9, 10, 12, 143, 36,
+- 38, 39, 40, 42, 43, 45, 46, 48,
+- 49, 51, 52, 54, 56, 57, 59, 60,
+- 62, 63, 32, 33, 165, 64, 65, 67,
+- 68, 69, 70, 72, 73, 74, 75, 77,
+- 78, 79, 48, 50, 50, 51, 52, 53,
+- 54, 55, 56, 57, 58, 59, 61, 61,
+- 193, 80, 81, 82, 83, 84, 86, 87,
+- 87, 72, 72, 74, 74, 75, 77, 77,
+- 208, 88, 89, 90, 91, 92, 93, 86,
+- 216, 95, 96, 97, 99, 99, 93, 223,
+- 101, 102, 103, 104, 99, 105, 106, 107,
+- 103, 233, 108, 109, 110, 111, 238, 112,
+- 240
+-};
+-
+-/*
+- * The next functions implement the arithmedic encoder and decoder
+- * required for JBIG. The same algorithm is also used in the arithmetic
+- * variant of JPEG.
+- */
+-
+-/* marker codes */
+-#define MARKER_STUFF 0x00
+-#define MARKER_ESC 0xff
+-
+-void arith_encode_init(struct jbg_arenc_state *s, int reuse_st)
+-{
+- int i;
+-
+- if (!reuse_st)
+- for (i = 0; i < 4096; s->st[i++] = 0);
+- s->c = 0;
+- s->a = 0x10000L;
+- s->sc = 0;
+- s->ct = 11;
+- s->buffer = -1; /* empty */
+-
+- return;
+-}
+-
+-
+-void arith_encode_flush(struct jbg_arenc_state *s)
+-{
+- unsigned long temp;
+-
+- /* find the s->c in the coding interval with the largest
+- * number of trailing zero bits */
+- if ((temp = (s->a - 1 + s->c) & 0xffff0000L) < s->c)
+- s->c = temp + 0x8000;
+- else
+- s->c = temp;
+- /* send remaining bytes to output */
+- s->c <<= s->ct;
+- if (s->c & 0xf8000000L) {
+- /* one final overflow has to be handled */
+- if (s->buffer >= 0) {
+- s->byte_out(s->buffer + 1, s->file);
+- if (s->buffer + 1 == MARKER_ESC)
+- s->byte_out(MARKER_STUFF, s->file);
+- }
+- /* output 0x00 bytes only when more non-0x00 will follow */
+- if (s->c & 0x7fff800L)
+- for (; s->sc; --s->sc)
+- s->byte_out(0x00, s->file);
+- } else {
+- if (s->buffer >= 0)
+- s->byte_out(s->buffer, s->file);
+- /* T.82 figure 30 says buffer+1 for the above line! Typo? */
+- for (; s->sc; --s->sc) {
+- s->byte_out(0xff, s->file);
+- s->byte_out(MARKER_STUFF, s->file);
+- }
+- }
+- /* output final bytes only if they are not 0x00 */
+- if (s->c & 0x7fff800L) {
+- s->byte_out((s->c >> 19) & 0xff, s->file);
+- if (((s->c >> 19) & 0xff) == MARKER_ESC)
+- s->byte_out(MARKER_STUFF, s->file);
+- if (s->c & 0x7f800L) {
+- s->byte_out((s->c >> 11) & 0xff, s->file);
+- if (((s->c >> 11) & 0xff) == MARKER_ESC)
+- s->byte_out(MARKER_STUFF, s->file);
+- }
+- }
+-
+- return;
+-}
+-
+-
+-void arith_encode(struct jbg_arenc_state *s, int cx, int pix)
+-{
+- register unsigned lsz, ss;
+- register unsigned char *st;
+- long temp;
[...5405 lines suppressed...]
-+ -e "s@\$${URLZJS}@$(URLZJS)@g" \
-+ -e "s@\$${URLHP}@$(URLHP)@g" \
-+ -e "s@\$${URLXQX}@$(URLXQX)@g" \
-+ -e "s@\$${URLLAVA}@$(URLLAVA)@g" \
-+ -e "s@\$${URLQPDL}@$(URLQPDL)@g" \
-+ -e "s@\$${URLSLX}@$(URLSLX)@g" \
-+ -e "s@\$${URLHC}@$(URLHC)@g" \
-+ -e "s@\$${PRODUCT}@$$PRODUCT@g" \
-+ -e "s/\$${MODindex}/$$MODindex $$TZ/" \
-+ -e "s/\$${MODtarball}/$$MODtarball $$TZ/"
-+ chmod -w $@
-+
-+web: test tar manual.pdf webindex
-+ ncftpput -m -f $(FTPSITE) foo2zjs \
-+ ChangeLog INSTALL manual.pdf foo2zjs.tar.gz;
-+
-+webt: tar manual.pdf webindex
-+ ncftpput -m -f $(FTPSITE) foo2zjs \
-+ ChangeLog INSTALL manual.pdf foo2zjs.tar.gz;
-+
-+webworld: web webpics
-+
-+webindex: INSTALL zjsindex oakindex hpindex xqxindex lavaindex \
-+ qpdlindex oakindex slxindex hcindex
-+
-+webpics: redhat suse ubuntu mandriva fedora
-+
-+webphotos:
-+ cd printer-photos; $(MAKE)
-+
-+zjsindex: foo2zjs.html archzjs.gif thermometer.gif webphotos
-+ ln -sf foo2zjs.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2zjs \
-+ index.html style.css archzjs.gif thermometer.gif \
-+ flags.png INSTALL INSTALL.osx zjsfavicon.png \
-+ printer-photos/printers.jpg;
-+
-+oakindex: foo2oak.html archoak.gif thermometer.gif webphotos
-+ ln -sf foo2oak.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2oak \
-+ index.html style.css archoak.gif thermometer.gif \
-+ flags.png INSTALL \
-+ printer-photos/printers.jpg;
-+
-+hpindex: foo2hp.html archhp.gif thermometer.gif webphotos
-+ ln -sf foo2hp.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2hp \
-+ index.html style.css archhp.gif thermometer.gif \
-+ flags.png INSTALL hpfavicon.png \
-+ printer-photos/printers.jpg;
-+
-+xqxindex: foo2xqx.html archxqx.gif thermometer.gif webphotos
-+ ln -sf foo2xqx.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2xqx \
-+ index.html style.css archxqx.gif thermometer.gif \
-+ flags.png INSTALL xqxfavicon.png \
-+ printer-photos/printers.jpg;
-+
-+lavaindex: foo2lava.html archlava.gif thermometer.gif webphotos
-+ ln -sf foo2lava.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2lava \
-+ index.html style.css archlava.gif thermometer.gif \
-+ flags.png INSTALL lavafavicon.png \
-+ printer-photos/printers.jpg;
-+
-+qpdlindex: foo2qpdl.html archqpdl.gif thermometer.gif webphotos
-+ ln -sf foo2qpdl.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2qpdl \
-+ index.html style.css archqpdl.gif thermometer.gif \
-+ flags.png INSTALL qpdlfavicon.png \
-+ printer-photos/printers.jpg;
-+
-+slxindex: foo2slx.html archslx.gif thermometer.gif webphotos
-+ ln -sf foo2slx.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2slx \
-+ index.html style.css archslx.gif thermometer.gif \
-+ flags.png INSTALL slxfavicon.png \
-+ printer-photos/printers.jpg;
-+
-+hcindex: foo2hiperc.html archhiperc.gif thermometer.gif webphotos
-+ ln -sf foo2hiperc.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2hiperc \
-+ index.html style.css archhiperc.gif thermometer.gif \
-+ flags.png INSTALL hipercfavicon.png \
-+ printer-photos/printers.jpg;
-+
-+foo2zjs.html: warning.html contribute.html resources.html unsupported.html
-+foo2hp.html: warning.html contribute.html resources.html unsupported.html
-+foo2xqx.html: warning.html contribute.html resources.html unsupported.html
-+foo2lava.html: warning.html contribute.html resources.html unsupported.html
-+foo2qpdl.html: warning.html contribute.html resources.html unsupported.html
-+foo2slx.html: warning.html contribute.html resources.html unsupported.html
-+foo2hiperc.html: warning.html contribute.html resources.html unsupported.html
-+foo2oak.html: warning.html contribute.html resources.html unsupported.html
-+
-+# RedHat
-+redhat: FRC
-+ cd redhat; $(MAKE) web FTPSITE=$(FTPSITE)
-+
-+# Fedora Core 6+
-+fedora: FRC
-+ cd fedora; $(MAKE) web FTPSITE=$(FTPSITE)
-+
-+suse: FRC
-+ cd suse; $(MAKE) web FTPSITE=$(FTPSITE)
-+
-+ubuntu: FRC
-+ cd ubuntu; $(MAKE) web FTPSITE=$(FTPSITE)
-+
-+mandriva: FRC
-+ cd mandriva; $(MAKE) web FTPSITE=$(FTPSITE)
-+
-+#
-+# Extra files from web
-+#
-+webextra: webicm webfw
-+
-+webicm: \
-+ icm/dl2300.tar.gz \
-+ icm/km2430.tar.gz icm/hpclj2600n.tar.gz \
-+ icm/hp1215.tar.gz icm/km2530.tar.gz \
-+ icm/km-1600.tar.gz \
-+ icm/samclp300.tar.gz icm/samclp315.tar.gz \
-+ icm/lexc500.tar.gz \
-+ icm/okic3200.tar.gz icm/okic3400.tar.gz icm/okic5600.tar.gz
-+ ncftpput -m -f $(FTPSITE) foo2zjs/icm icm/dl2300.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2zjs/icm icm/km2430.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2hp/icm icm/hpclj2600n.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2hp/icm icm/hp1215.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2lava/icm icm/km2530.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2lava/icm icm/km-1600.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2qpdl/icm icm/samclp300.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2qpdl/icm icm/samclp315.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2slx/icm icm/lexc500.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2hiperc/icm icm/okic3200.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2hiperc/icm icm/okic3400.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2hiperc/icm icm/okic5600.tar.gz;
-+
-+icm/dl2300.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ CP*.icm DL*.icm
-+icm/km2430.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ km2430*.icm
-+icm/hpclj2600n.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ hpclj2600*.icm
-+icm/hp1215.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ hp1215*.icm
-+icm/km2530.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ km2530*.icm
-+icm/km-1600.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ km-1600*.icm
-+icm/samclp300.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ samclp300*.icm
-+icm/samclp315.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ samclp315*.icm
-+icm/lexc500.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ lexR*.icm
-+icm/okic3200.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ OK32*.icm
-+icm/okic3400.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ C3400*.icm
-+icm/okic5600.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ OK56*.icm
-+
-+webfw: firmware/sihp1000.tar.gz \
-+ firmware/sihp1005.tar.gz \
-+ firmware/sihp1018.tar.gz \
-+ firmware/sihp1020.tar.gz \
-+ firmware/sihpP1005.tar.gz \
-+ firmware/sihpP1006.tar.gz \
-+ firmware/sihpP1505.tar.gz \
-+ $(NULL)
-+ ncftpput -m -f $(FTPSITE) foo2zjs/firmware firmware/*.tar.gz;
-+
-+firmware/sihp1000.tar.gz: FRC
-+ cd firmware; tar -c -z -f ../$@ sihp1000.img
-+firmware/sihp1005.tar.gz: FRC
-+ cd firmware; tar -c -z -f ../$@ sihp1005.img
-+firmware/sihp1018.tar.gz: FRC
-+ cd firmware; tar -c -z -f ../$@ sihp1018.img
-+firmware/sihp1020.tar.gz: FRC
-+ cd firmware; tar -c -z -f ../$@ sihp1020.img
-+firmware/sihpP1005.tar.gz: FRC
-+ cd firmware; tar -c -z -f ../$@ sihpP1005.img
-+firmware/sihpP1006.tar.gz: FRC
-+ cd firmware; tar -c -z -f ../$@ sihpP1006.img
-+firmware/sihpP1505.tar.gz: FRC
-+ cd firmware; tar -c -z -f ../$@ sihpP1505.img
-+
-+FRC:
-+
-+#
-+# Misc
-+#
-+misc: pksm2bitcmyk phorum-logo.gif
-+
-+pksm2bitcmyk: pksm2bitcmyk.c
-+ $(CC) $(CFLAGS) pksm2bitcmyk.c -lnetpbm -o $@
-+
-+phorum-logo.gif: archhp.fig
-+ fig2dev -L gif -m.25 archhp.fig | giftrans -t "#ffffff" -o $@
Index: foo2zjs.spec
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/devel/foo2zjs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- foo2zjs.spec 19 Apr 2010 11:59:08 -0000 1.9
+++ foo2zjs.spec 5 Oct 2011 17:29:49 -0000 1.10
@@ -1,4 +1,4 @@
-%define foo2zjs_ver 20100413
+%define foo2zjs_ver 20110909
Name: foo2zjs
Version: 0.%{foo2zjs_ver}
@@ -6,15 +6,20 @@
Summary: Linux printer driver for ZjStream protocol
Group: System Environment/Libraries
-License: GPL
+License: GPLv2
URL: http://foo2zjs.rkkda.com/
Source0: foo2zjs-%{foo2zjs_ver}.tar.gz
Patch0: foo2zjs-dynamic-jbig.patch
+Patch1: foo2zjs-device-ids.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: jbigkit-devel groff ghostscript
+BuildRequires: bc
+# For the psdriver autoprovides
+BuildRequires: python-cups
Requires: lcms
+Requires: argyllcms
Requires(post): /bin/rm
%package -n foo2hp
@@ -186,11 +191,27 @@
%prep
%setup -q -n foo2zjs
+
+# Patch to use jbigkit-devel package instead of static jbig source code
%patch0 -p1
+
+# add missing 1284 Device IDs
+%patch1 -p1
+
+# Remove jbig source code, jbigkit-devel package is used in BuildRequires
+#rm -f jbig*
+
sed -i -e s/foo2zjs-icc2ps/icc2ps/g *wrapper*
sed -i -e s/775/755/ Makefile
chmod -x COPYING
+# Xerox-Phaser_6110 not needed files because already in foomatic-db package
+rm foomatic-db/printer/Xerox-Phaser_6110.xml
+rm PPD/Xerox-Phaser_6110.ppd
+
+# Samsung CLP-310 already included in foomatic-db package
+rm foomatic-db/printer/Samsung-CLP-310.xml
+
%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
@@ -211,8 +232,6 @@
# Remove man page for usb_printerid which we don't ship
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/usb_printerid.1
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/printer-profile.1
-rm -f $RPM_BUILD_ROOT%{_bindir}/printer-profile
%clean
@@ -222,9 +241,15 @@
%files
%defattr(-,root,root,-)
%{_bindir}/*zjs*
+%{_bindir}/printer-profile
%{_datadir}/foo2zjs
%{_mandir}/man1/*zjs*
+%{_mandir}/man1/printer-profile.1.gz
+%{_mandir}/man1/gipddecode.1.gz
%{_datadir}/foomatic/db/source/driver/foo2zjs.xml
+%{_datadir}/foomatic/db/source/driver/foo2zjs-z1.xml
+%{_datadir}/foomatic/db/source/driver/foo2zjs-z2.xml
+%{_datadir}/foomatic/db/source/driver/foo2zjs-z3.xml
%{_datadir}/foomatic/db/source/opt/foo2zjs*.xml
%{_datadir}/foomatic/db/source/opt/foo2xxx*.xml
%{_datadir}/foomatic/db/source/printer/Generic-ZjStream_Printer.xml
@@ -233,14 +258,17 @@
%{_datadir}/foomatic/db/source/printer/Minolta-magicolor_2200_DL.xml
%{_datadir}/foomatic/db/source/printer/Minolta-magicolor_2300_DL.xml
%{_datadir}/foomatic/db/source/printer/Minolta-magicolor_2430_DL.xml
+%{_datadir}/foomatic/db/source/printer/Olivetti-d-Color_P160W.xml
%{_datadir}/cups/model/Generic-ZjStream_Printer.ppd.gz
%{_datadir}/cups/model/HP-LaserJet_1*.ppd.gz
%{_datadir}/cups/model/Minolta-Color_PageWorks_Pro_L.ppd.gz
%{_datadir}/cups/model/Minolta-magicolor_2200_DL.ppd.gz
%{_datadir}/cups/model/Minolta-magicolor_2300_DL.ppd.gz
%{_datadir}/cups/model/Minolta-magicolor_2430_DL.ppd.gz
+%{_datadir}/cups/model/Olivetti-d-Color_P160W.ppd.gz
%files -n foo2hp
+%defattr(-,root,root,-)
%{_bindir}/*hp*
%{_mandir}/man1/*hp*
%{_datadir}/foomatic/db/source/driver/foo2hp.xml
@@ -253,6 +281,7 @@
%{_datadir}/cups/model/HP-Color_LaserJet_2600n.ppd.gz
%files -n foo2xqx
+%defattr(-,root,root,-)
%{_bindir}/*xqx*
%{_mandir}/man1/*xqx*
%{_datadir}/foomatic/db/source/driver/foo2xqx.xml
@@ -263,35 +292,47 @@
%{_datadir}/cups/model/HP-LaserJet_P*.ppd.gz
%files -n foo2lava
+%defattr(-,root,root,-)
%{_bindir}/*lava*
%{_bindir}/opldecode
%{_mandir}/man1/*lava*
%{_mandir}/man1/opldecode.1.gz
%{_datadir}/foomatic/db/source/driver/foo2lava.xml
%{_datadir}/foomatic/db/source/opt/foo2lava*.xml
-%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_16*.xml
%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2480_MF.xml
%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2490_MF.xml
%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2530_DL.xml
+%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1600W.xml
+%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1680MF.xml
+%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1690MF.xml
%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_4690MF.xml
-%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_16*.ppd.gz
+%{_datadir}/foomatic/db/source/printer/Xerox-Phaser_6121MFP.xml
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2480_MF.ppd.gz
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2490_MF.ppd.gz
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2530_DL.ppd.gz
+%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_1600W.ppd.gz
+%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_1680MF.ppd.gz
+%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_1690MF.ppd.gz
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_4690MF.ppd.gz
+%{_datadir}/cups/model/Xerox-Phaser_6121MFP.ppd.gz
+
%files -n foo2qpdl
+%defattr(-,root,root,-)
%{_bindir}/*qpdl*
+%{_bindir}/hbpldecode
%{_mandir}/man1/*qpdl*
+%{_mandir}/man1/hbpldecode*
%{_datadir}/foomatic/db/source/driver/foo2qpdl.xml
%{_datadir}/foomatic/db/source/opt/foo2qpdl*.xml
%{_datadir}/foomatic/db/source/printer/Samsung-CL*.xml
-%{_datadir}/foomatic/db/source/printer/Xerox-Phaser_611*.xml
+%{_datadir}/foomatic/db/source/printer/Xerox-Phaser_6115MFP.xml
%{_datadir}/cups/model/Samsung-CL*.ppd.gz
-%{_datadir}/cups/model/Xerox-Phaser_611*.ppd.gz
+%{_datadir}/cups/model/Xerox-Phaser_6115MFP.ppd.gz
%{_datadir}/foo2qpdl/crd/
%files -n foo2slx
+%defattr(-,root,root,-)
%{_bindir}/*slx*
%{_bindir}/gipddecode
%{_mandir}/man1/*slx*
@@ -301,6 +342,7 @@
%{_datadir}/cups/model/Lexmark-C500.ppd.gz
%files -n foo2hiperc
+%defattr(-,root,root,-)
%{_bindir}/*hiperc*
%{_mandir}/man1/*hiperc*
%{_datadir}/foomatic/db/source/driver/foo2hiperc.xml
@@ -309,6 +351,7 @@
%{_datadir}/cups/model/Oki-C*.ppd.gz
%files -n foo2oak
+%defattr(-,root,root,-)
%{_bindir}/*oak*
%{_mandir}/man1/*oak*.1.gz
%{_datadir}/foomatic/db/source/opt/foo2oak*
@@ -350,11 +393,48 @@
/bin/rm -f /var/cache/foomatic/*
%changelog
-* Mon Apr 19 2010 David Woodhouse <dwmw2(a)infradead.org> 0.20100413-1
-- Update to 20100413
-
-* Sun Nov 08 2009 David Woodhouse <dwmw2(a)infradead.org> 0.20091106-1
-- Update to 20091106
+* Wed Oct 5 2011 David Woodhouse <dwmw2(a)infradead.org> 0.20110909-1
+- Update to latest release
+- Add Konica Minolta variant of 2430DL and 2300DL
+- BR python-cups to get foomatic autodeps working
+
+* Thu Jun 7 2011 Cédric Olivier <cedric.olivier(a)free.fr> 0.20110602-1
+- New program: hbpldecode for decoding Fuji-Zerox cp105b and Dell 1250c
+
+* Sun Feb 13 2011 Cédric Olivier <cedric.olivier(a)free.fr> 0.20110210-1
+- Update to last release
+- New Printer: Olivetti d-Color P160W
+- New Printer: HP LaserJet Pro CP1025nw
+- New printers: HP LaserJet 1022n, HP LaserJet 1022nw
+- New Printer: Oki C310dn
+
+* Sat Oct 23 2010 Cedric Olivier <cedric.olivier(a)free.fr> 0.20101016-1
+- Update to last release
+- Remove Samsung-CLP-310.xml which conflict with foomatic-db package
+
+* Wed Sep 17 2010 Cedric Olivier <cedric.olivier(a)free.fr> 0.20100817-1
+- New foo2lava printer: Xerox Phaser 6121MFP (printer only)
+- Added manual page for foo2zjs-icc2ps
+
+* Thu Jul 22 2010 Cedric Olivier <cedric.olivier(a)free.fr> 0.20100722-1
+- New Printer: Oki C110
+- Change PPD's for Konica Minolta mc1600W, mc1680MF, mc1690MF, mc2490 MF, mc2530 DL,
mc4690MF,
+and Oki C110 if cups-devel is installed.
+- Used for reporting marker (toner) levels via PJL on foo2lava printers.
+
+* Thu May 11 2010 Cedric Olivier <cedric.olivier(a)free.fr> 0.20100506-2
+- add foo2zjs-dynamic-jbig patch to use jbigkit-devel package instead of static jbig
source code
+
+* Fri May 07 2010 Cedric Olivier <cedric.olivier(a)free.fr> 0.20100506-1
+- Update to 20100506
+- New Printers: Oki C5650
+- New Printers: HP LaserJet Pro P1102, P1102w
+- New Printers: HP LaserJet Pro P1566
+- New Printers: HP LaserJet Pro P1606dn
+
+* Wed Mar 10 2010 Cedric Olivier <cedric.olivier(a)free.fr> 0.20100307-1
+- Update to 20100307
+- BugFix and adding new printers supports
* Sat Apr 25 2009 Lubomir Rintel <lkundrak(a)v3.sk> 0.20080826-3
- Add proper scriptlet requires
Index: sources
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 19 Apr 2010 11:55:17 -0000 1.6
+++ sources 5 Oct 2011 17:29:49 -0000 1.7
@@ -1 +1 @@
-c6de65768824d84f01a0fe116014db68 foo2zjs-20100413.tar.gz
+3829aae821b231386630f6d0dec805d2 foo2zjs-20110909.tar.gz