Author: dwmw2 Update of /cvs/free/rpms/foo2zjs/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv9842 Modified Files: .cvsignore foo2zjs-dynamic-jbig.patch foo2zjs.spec sources Removed Files: foo2zjs-jbig2.patch Log Message: update to 20091106 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/foo2zjs/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Sep 2008 22:53:06 -0000 1.3 +++ .cvsignore 8 Nov 2009 23:19:07 -0000 1.4 @@ -1 +1 @@ -foo2zjs-20080826.tar.gz +foo2zjs-20091106.tar.gz foo2zjs-dynamic-jbig.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 foo2zjs-dynamic-jbig.patch Index: foo2zjs-dynamic-jbig.patch =================================================================== RCS file: /cvs/free/rpms/foo2zjs/devel/foo2zjs-dynamic-jbig.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- foo2zjs-dynamic-jbig.patch 3 Aug 2008 13:37:16 -0000 1.2 +++ foo2zjs-dynamic-jbig.patch 8 Nov 2009 23:19:07 -0000 1.3 @@ -1,3933 +1,27 @@ -diff -uNr foo2zjs-jbig/jbig.c foo2zjs/jbig.c ---- foo2zjs-jbig/jbig.c 2004-06-12 03:33:05.000000000 +0100 -+++ foo2zjs/jbig.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,3194 +0,0 @@ --/* -- * Portable Free JBIG image compression library -- * -- * Markus Kuhn -- http://www.cl.cam.ac.uk/~mgk25/ -- * -- * Id: jbig.c,v 1.22 2004-06-11 15:17:06+01 mgk25 Exp $ -- * $Id$ -- * -- * This module implements a portable standard C encoder and decoder -- * using the JBIG lossless bi-level image compression algorithm as -- * specified in International Standard ISO 11544:1993 or equivalently -- * as specified in ITU-T Recommendation T.82. See the file jbig.doc -- * for usage instructions and application examples. -- * -- * 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. -- */ -- --#ifdef DEBUG --#include <stdio.h> --#else --#define NDEBUG --#endif -- --#include <stdlib.h> --#include <string.h> --#include <assert.h> -- --#include "jbig.h" -- -- --/* optional export of arithmetic coder functions for test purposes */ --#ifdef TEST_CODEC --#define ARITH --#define ARITH_INL --#else --#define ARITH static --#ifdef __GNUC__ --#define ARITH_INL static __inline__ --#else --#define ARITH_INL static --#endif --#endif -- --#define MX_MAX 127 /* maximal supported mx offset for -- * adaptive template in the encoder */ -- --#define TPB2CX 0x195 /* contexts for TP special pixels */ --#define TPB3CX 0x0e5 --#define TPDCX 0xc3f -- --/* marker codes */ --#define MARKER_STUFF 0x00 --#define MARKER_RESERVE 0x01 --#define MARKER_SDNORM 0x02 --#define MARKER_SDRST 0x03 --#define MARKER_ABORT 0x04 --#define MARKER_NEWLEN 0x05 --#define MARKER_ATMOVE 0x06 --#define MARKER_COMMENT 0x07 --#define MARKER_ESC 0xff -- --/* loop array indices */ --#define STRIPE 0 --#define LAYER 1 --#define PLANE 2 -- --/* special jbg_buf pointers (instead of NULL) */ --#define SDE_DONE ((struct jbg_buf *) -1) --#define SDE_TODO ((struct jbg_buf *) 0) -- --/* object code version id */ -- --const char jbg_version[] = --" JBIG-KIT " JBG_VERSION " -- Markus Kuhn -- " --"$Id$ "; -- --/* -- * the following array specifies for each combination of the 3 -- * ordering bits, which ii[] variable represents which dimension -- * of s->sde. -- */ --static const int iindex[8][3] = { -- { 2, 1, 0 }, /* no ordering bit set */ -- { -1, -1, -1}, /* SMID -> illegal combination */ -- { 2, 0, 1 }, /* ILEAVE */ -- { 1, 0, 2 }, /* SMID + ILEAVE */ -- { 0, 2, 1 }, /* SEQ */ -- { 1, 2, 0 }, /* SEQ + SMID */ -- { 0, 1, 2 }, /* SEQ + ILEAVE */ -- { -1, -1, -1 } /* SEQ + SMID + ILEAVE -> illegal combination */ --}; -- -- --/* -- * Array [language][message] with text string error messages that correspond -- * to return values from public functions in this library. -- */ --#define NEMSG 9 /* number of error codes */ --#define NEMSG_LANG 3 /* number of supported languages */ --static const char *errmsg[NEMSG_LANG][NEMSG] = { -- /* English (JBG_EN) */ -- { -- "Everything is ok", /* JBG_EOK */ -- "Reached specified maximum size", /* JBG_EOK_INTR */ -- "Unexpected end of data", /* JBG_EAGAIN */ -- "Not enough memory available", /* JBG_ENOMEM */ -- "ABORT marker found", /* JBG_EABORT */ -- "Unknown marker segment encountered", /* JBG_EMARKER */ -- "Incremental BIE does not fit to previous one", /* JBG_ENOCONT */ -- "Invalid data encountered", /* JBG_EINVAL */ -- "Unimplemented features used" /* JBG_EIMPL */ -- }, -- /* German (JBG_DE_8859_1) */ -- { -- "Kein Problem aufgetreten", /* JBG_EOK */ -- "Angegebene maximale Bildgr\366\337e erreicht", /* JBG_EOK_INTR */ -- "Unerwartetes Ende der Daten", /* JBG_EAGAIN */ -- "Nicht gen\374gend Speicher vorhanden", /* JBG_ENOMEM */ -- "Es wurde eine Abbruch-Sequenz gefunden", /* JBG_EABORT */ -- "Eine unbekannte Markierungssequenz wurde gefunden", /* JBG_EMARKER */ -- "Neue Daten passen nicht zu vorangegangenen Daten", /* JBG_ENOCONT */ -- "Es wurden ung\374ltige Daten gefunden", /* JBG_EINVAL */ -- "Noch nicht implementierte Optionen wurden benutzt" /* JBG_EIMPL */ -- }, -- /* German (JBG_DE_UTF_8) */ -- { -- "Kein Problem aufgetreten", /* JBG_EOK */ -- "Angegebene maximale Bildgr\303\266\303\237e erreicht", /* JBG_EOK_INTR */ -- "Unerwartetes Ende der Daten", /* JBG_EAGAIN */ -- "Nicht gen\303\274gend Speicher vorhanden", /* JBG_ENOMEM */ -- "Es wurde eine Abbruch-Sequenz gefunden", /* JBG_EABORT */ -- "Eine unbekannte Markierungssequenz wurde gefunden", /* JBG_EMARKER */ -- "Neue Daten passen nicht zu vorangegangenen Daten", /* JBG_ENOCONT */ -- "Es wurden ung\303\274ltige Daten gefunden", /* JBG_EINVAL */ -- "Noch nicht implementierte Optionen wurden benutzt" /* JBG_EIMPL */ -- } --}; -- -- -- --/* -- * The following three functions are the only places in this code, were -- * C library memory management functions are called. The whole JBIG -- * library has been designed in order to allow multi-threaded -- * execution. No static or global variables are used, so all fuctions -- * are fully reentrant. However if you want to use this multi-thread -- * capability and your malloc, realloc and free are not reentrant, -- * then simply add the necessary semaphores or mutex primitives below. -- * In contrast to C's malloc() and realloc(), but like C's calloc(), -- * these functions take two parameters nmemb and size that are multiplied -- * before being passed on to the corresponding C function. -- * This we can catch all overflows during a size_t multiplication a -- * a single place. -- */ -- --#ifndef SIZE_MAX --#define SIZE_MAX ((size_t) -1) /* largest value of size_t */ --#endif -- --static void *checked_malloc(size_t nmemb, size_t size) --{ -- void *p; -- [...5139 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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- foo2zjs.spec 25 Apr 2009 10:00:30 -0000 1.6 +++ foo2zjs.spec 8 Nov 2009 23:19:08 -0000 1.7 @@ -1,8 +1,8 @@ -%define foo2zjs_ver 20080826 +%define foo2zjs_ver 20091106 Name: foo2zjs Version: 0.%{foo2zjs_ver} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Linux printer driver for ZjStream protocol Group: System Environment/Libraries @@ -11,7 +11,6 @@ Source0: foo2zjs-%{foo2zjs_ver}.tar.gz Patch0: foo2zjs-dynamic-jbig.patch -Patch1: foo2zjs-jbig2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: jbigkit-devel groff ghostscript @@ -188,7 +187,6 @@ %prep %setup -q -n foo2zjs %patch0 -p1 -%patch1 -p1 sed -i -e s/foo2zjs-icc2ps/icc2ps/g *wrapper* sed -i -e s/775/755/ Makefile chmod -x COPYING @@ -213,6 +211,8 @@ # 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 @@ -269,12 +269,16 @@ %{_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_4690MF.xml +%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_16*.ppd.gz %{_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_4690MF.ppd.gz %files -n foo2qpdl %{_bindir}/*qpdl* @@ -282,9 +286,9 @@ %{_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_611*.xml %{_datadir}/cups/model/Samsung-CL*.ppd.gz -%{_datadir}/cups/model/Xerox-Phaser-611*.ppd.gz +%{_datadir}/cups/model/Xerox-Phaser_611*.ppd.gz %{_datadir}/foo2qpdl/crd/ %files -n foo2slx @@ -346,6 +350,9 @@ /bin/rm -f /var/cache/foomatic/* %changelog +* Sun Nov 08 2009 David Woodhouse <dwmw2(a)infradead.org&gt; 0.20091106-1 +- Update to 20091106 + * Sat Apr 25 2009 Lubomir Rintel <lkundrak(a)v3.sk&gt; 0.20080826-3 - Add proper scriptlet requires Index: sources =================================================================== RCS file: /cvs/free/rpms/foo2zjs/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Sep 2008 22:53:06 -0000 1.4 +++ sources 8 Nov 2009 23:19:08 -0000 1.5 @@ -1 +1 @@ -d714e40746cf1a13e6945f13d211ff6a foo2zjs-20080826.tar.gz +1e664a4e9847df7f440e31523773e2dd foo2zjs-20091106.tar.gz --- foo2zjs-jbig2.patch DELETED ---