1:37 p.m.
Author: thl
Update of /cvs/free/rpms/foo2zjs/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16243
Modified Files:
foo2zjs-dynamic-jbig.patch foo2zjs.spec sources
Log Message:
clog
foo2zjs-dynamic-jbig.patch:
Index: foo2zjs-dynamic-jbig.patch
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/devel/foo2zjs-dynamic-jbig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- foo2zjs-dynamic-jbig.patch 3 Aug 2008 12:25:48 -0000 1.1
+++ foo2zjs-dynamic-jbig.patch 3 Aug 2008 13:37:16 -0000 1.2
@@ -3906,9 +3906,9 @@
- 2,0,2,0,2,1,2,1,2,2,2,0,2,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
- 2,2,2,2,2,2,2,2,2,2,2,0,2,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-};
---- foo2zjs/Makefile.orig 2007-07-18 19:34:22.000000000 +0100
-+++ foo2zjs/Makefile 2007-08-29 16:30:04.000000000 +0100
-@@ -89,9 +89,6 @@ FILES = \
+--- foo2zjs/Makefile.orig 2008-03-21 15:21:41.000000000 +0000
++++ foo2zjs/Makefile 2008-03-26 09:32:51.000000000 +0000
+@@ -122,9 +122,6 @@ FILES = \
Makefile \
foo2zjs.c \
foo2zjs.1in \
@@ -3918,18 +3918,18 @@
zjsdecode.c \
zjsdecode.1in \
zjs.h \
-@@ -182,7 +179,7 @@ MANPAGES+= foo2xqx-wrapper.1 foo2xqx.1 x
- MANPAGES+= foo2lava-wrapper.1 foo2lava.1 lavadecode.1
- MANPAGES+= foo2qpdl-wrapper.1 foo2qpdl.1 qpdldecode.1
- MANPAGES+= opldecode.1
+@@ -239,7 +236,7 @@ MANPAGES+= foo2qpdl-wrapper.1 foo2qpdl.1
+ MANPAGES+= foo2slx-wrapper.1 foo2slx.1 slxdecode.1
+ MANPAGES+= foo2hiperc-wrapper.1 foo2hiperc.1 hipercdecode.1
+ MANPAGES+= foo2zjs-pstops.1 arm2hpdl.1 usb_printerid.1
-LIBJBG = jbig.o jbig_tab.o
+LIBJBG = -ljbig
BINPROGS=
ifeq ($(UNAME),Linux)
-@@ -305,23 +302,23 @@ all-test:
- # ... OK!
- #
+@@ -376,29 +373,29 @@ all-done:
+ @echo "yourself."
+
-foo2zjs: foo2zjs.o $(LIBJBG)
+foo2zjs: foo2zjs.o
@@ -3952,23 +3952,35 @@
+foo2qpdl: foo2qpdl.o
$(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG)
--zjsdecode: zjsdecode.o $(LIBJBG)
-+zjsdecode: zjsdecode.o
- $(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@
+-foo2oak: foo2oak.o $(LIBJBG)
++foo2oak: foo2oak.o
+ $(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG)
+
+-foo2slx: foo2slx.o $(LIBJBG)
++foo2slx: foo2slx.o
+ $(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG)
+
+-foo2hiperc: foo2hiperc.o $(LIBJBG)
++foo2hiperc: foo2hiperc.o
+ $(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG)
- foo2zjs-wrapper: foo2zjs-wrapper.in Makefile
-@@ -364,25 +361,25 @@ getweb: getweb.in Makefile
+
+@@ -461,37 +458,37 @@ getweb: getweb.in Makefile
all-icc2ps:
cd icc2ps; $(MAKE) all
--okidecode: okidecode.o $(LIBJBG)
-+okidecode: okidecode.o
- $(CC) $(CFLAGS) okidecode.o $(LIBJBG) -o $@
-
-ok: ok.o $(LIBJBG)
+ok: ok.o
$(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@
+-zjsdecode: zjsdecode.o $(LIBJBG)
++zjsdecode: zjsdecode.o
+ $(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@
+
+-hipercdecode: hipercdecode.o $(LIBJBG)
++hipercdecode: hipercdecode.o
+ $(CC) $(CFLAGS) hipercdecode.o $(LIBJBG) -o $@
+
-splcdecode: splcdecode.o $(LIBJBG)
+splcdecode: splcdecode.o
$(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@
@@ -3989,8 +4001,20 @@
+opldecode: opldecode.o
$(CC) $(CFLAGS) -g opldecode.o $(LIBJBG) -o $@
+-oakdecode: oakdecode.o $(LIBJBG)
++oakdecode: oakdecode.o
+ $(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@
+
+-slxdecode: slxdecode.o $(LIBJBG)
++slxdecode: slxdecode.o
+ $(CC) $(CFLAGS) slxdecode.o $(LIBJBG) -o $@
+
+-gipddecode: gipddecode.o $(LIBJBG)
++gipddecode: gipddecode.o
+ $(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@
+
#
-@@ -708,17 +705,12 @@ clean:
+@@ -925,21 +922,18 @@ clean:
#
# Header dependencies
#
@@ -3998,37 +4022,29 @@
-foo2zjs.o: zjs.h jbig.h
-jbig.o: jbig.h
-foo2hp.o: zjs.h jbig.h cups.h
--xqxdecode.o: xqx.h jbig.h
-foo2xqx.o: xqx.h jbig.h
--lavadecode.o: jbig.h
-foo2lava.o: jbig.h
--qpdldecode.o: jbig.h
-foo2qpdl.o: jbig.h qpdl.h
+-foo2slx.o: slx.h jbig.h
+-foo2hiperc.o: jbig.h hiperc.h
+-hipercdecode.o: hiperc.h jbig.h
+-lavadecode.o: jbig.h
+-qpdldecode.o: jbig.h
-opldecode.o: jbig.h
+-slxdecode.o: slx.h jbig.h
+-xqxdecode.o: xqx.h jbig.h
+zjsdecode.o: zjs.h
+foo2zjs.o: zjs.h
++jbig.o:
+foo2hp.o: zjs.h cups.h
-+xqxdecode.o: xqx.h
+foo2xqx.o: xqx.h
++foo2lava.o:
+foo2qpdl.o: qpdl.h
++foo2slx.o: slx.h
++foo2hiperc.o: hiperc.h
++hipercdecode.o: hiperc.h
++slxdecode.o: slx.h
++xqxdecode.o: xqx.h
#
# foo2* Regression tests
-@@ -1168,7 +1160,7 @@ foo2oak-wrapper: foo2oak-wrapper.in Make
-
- SYSNAME := $(shell uname -n)
- ifeq ($(SYSNAME),ipcroe.rkkda.com)
--foo2oak_$(MACH).o: oak.h jbig.h foo2oak.c
-+foo2oak_$(MACH).o: oak.h foo2oak.c
- cp -a foo2oak.c foo2oak_$(MACH).c
- $(CC) $(CFLAGS) -c foo2oak_$(MACH).c
- oakdecode_$(MACH).o: oak.h oakdecode.c
-@@ -1176,7 +1168,7 @@ oakdecode_$(MACH).o: oak.h oakdecode.c
- $(CC) $(CFLAGS) -c oakdecode_$(MACH).c
- endif
- ifeq ($(SYSNAME),amd.rkkda.org)
--foo2oak_$(MACH).o: oak.h jbig.h foo2oak.c
-+foo2oak_$(MACH).o: oak.h foo2oak.c
- cp -a foo2oak.c foo2oak_$(MACH).c
- $(CC) $(CFLAGS) -c foo2oak_$(MACH).c
- oakdecode_$(MACH).o: oak.h oakdecode.c
Index: foo2zjs.spec
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/devel/foo2zjs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- foo2zjs.spec 3 Aug 2008 12:25:48 -0000 1.1
+++ foo2zjs.spec 3 Aug 2008 13:37:16 -0000 1.2
@@ -1,6 +1,6 @@
Name: foo2zjs
-Version: 0.20070822
-Release: 2%{?dist}
+Version: 0.20080324
+Release: 1%{?dist}
Summary: Linux printer driver for ZjStream protocol
Group: System Environment/Libraries
@@ -33,6 +33,16 @@
Group: System Environment/Libraries
Requires: lcms foo2zjs
+%package -n foo2slx
+Summary: Linux printer driver for SLX protocol (Lexmark C500n etc.)
+Group: System Environment/Libraries
+Requires: lcms foo2zjs
+
+%package -n foo2hiperc
+Summary: Linux printer driver for HIPERC protocol (Oki C3400n etc.)
+Group: System Environment/Libraries
+Requires: lcms foo2zjs
+
%description
foo2zjs is an open source printer driver for printers that use the
Zenographics ZjStream wire protocol for their print data, such as the
@@ -111,8 +121,35 @@
Epson, ZjStream, etc.
Users of this package are requested to visit the author's web page at
-http://foo2lava.rkkda.com/ and consider contributing.
+http://foo2qpdl.rkkda.com/ and consider contributing.
+%description -n foo2slx
+foo2slx is an open source printer driver for printers that use the
+Software Imaging K.K. SLX wire protocol for their print data, such as
+the Lexmark C500n. These printers are often erroneously referred to as
+winprinters or GDI printers. However, Microsoft GDI only mandates the
+API between an application and the printer driver, not the protocol on
+the wire between the printer driver and the printer. In fact, SLX
+printers are raster printers which happen to use a very efficient wire
+protocol which was developed by Zenographics and cloned by Software
+Imaging K.K. and licensed by most major printer manufacturers for at
+least some of their product lines. SLX is just one of many wire
+protocols that are in use today, such as Postscript, PCL, Epson,
+ZjStream, etc.
+
+Users of this package are requested to visit the author's web page at
+http://foo2slx.rkkda.com/ and consider contributing.
+
+%description -n foo2hiperc
+foo2hiperc is an open source printer driver for printers that use the
+HIPERC wire protocol for their print data, such as the Oki C3400n and
+the Oki C5500n.
+
+NOTE: This driver is currently in Alpha and supports uncompressed mode
+only.
+
+Users of this package are requested to visit the author's web page at
+http://foo2hiperc.rkkda.com/ and consider contributing.
%prep
%setup -q -n foo2zjs
@@ -150,6 +187,8 @@
rm -f $RPM_BUILD_ROOT/usr/share/cups/model/Generic-OAKT_Printer.ppd.gz
rm -f $RPM_BUILD_ROOT/usr/share/cups/model/HP-Color_LaserJet_1500.ppd.gz
+# Remove man page for usb_printerid which we don't ship
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/usb_printerid.1
%clean
@@ -163,22 +202,15 @@
%{_mandir}/man1/*zjs*
%{_datadir}/foomatic/db/source/driver/foo2zjs.xml
%{_datadir}/foomatic/db/source/opt/foo2zjs*.xml
+%{_datadir}/foomatic/db/source/opt/foo2xxx*.xml
%{_datadir}/foomatic/db/source/printer/Generic-ZjStream_Printer.xml
-%{_datadir}/foomatic/db/source/printer/HP-LaserJet_1000.xml
-%{_datadir}/foomatic/db/source/printer/HP-LaserJet_1005.xml
-%{_datadir}/foomatic/db/source/printer/HP-LaserJet_1018.xml
-%{_datadir}/foomatic/db/source/printer/HP-LaserJet_1020.xml
-%{_datadir}/foomatic/db/source/printer/HP-LaserJet_1022.xml
+%{_datadir}/foomatic/db/source/printer/HP-LaserJet_1*.xml
%{_datadir}/foomatic/db/source/printer/Minolta-Color_PageWorks_Pro_L.xml
%{_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}/cups/model/Generic-ZjStream_Printer.ppd.gz
-%{_datadir}/cups/model/HP-LaserJet_1000.ppd.gz
-%{_datadir}/cups/model/HP-LaserJet_1005.ppd.gz
-%{_datadir}/cups/model/HP-LaserJet_1018.ppd.gz
-%{_datadir}/cups/model/HP-LaserJet_1020.ppd.gz
-%{_datadir}/cups/model/HP-LaserJet_1022.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
@@ -199,8 +231,10 @@
%{_mandir}/man1/*xqx*
%{_datadir}/foomatic/db/source/driver/foo2xqx.xml
%{_datadir}/foomatic/db/source/opt/foo2xqx*.xml
-%{_datadir}/foomatic/db/source/printer/HP-LaserJet_M1005_MFP.xml
-%{_datadir}/cups/model/HP-LaserJet_M1005_MFP.ppd.gz
+%{_datadir}/foomatic/db/source/printer/HP-LaserJet_M*.xml
+%{_datadir}/foomatic/db/source/printer/HP-LaserJet_P*.xml
+%{_datadir}/cups/model/HP-LaserJet_M*.ppd.gz
+%{_datadir}/cups/model/HP-LaserJet_P*.ppd.gz
%files -n foo2lava
%{_bindir}/*lava*
@@ -227,6 +261,23 @@
%{_datadir}/cups/model/Xerox-Phaser-611*.ppd.gz
%{_datadir}/foo2qpdl/crd/
+%files -n foo2slx
+%{_bindir}/*slx*
+%{_bindir}/gipddecode
+%{_mandir}/man1/*slx*
+%{_datadir}/foomatic/db/source/driver/foo2slx.xml
+%{_datadir}/foomatic/db/source/opt/foo2slx*.xml
+%{_datadir}/foomatic/db/source/printer/Lexmark-C500.xml
+%{_datadir}/cups/model/Lexmark-C500.ppd.gz
+
+%files -n foo2hiperc
+%{_bindir}/*hiperc*
+%{_mandir}/man1/*hiperc*
+%{_datadir}/foomatic/db/source/driver/foo2hiperc.xml
+%{_datadir}/foomatic/db/source/opt/foo2hiperc*.xml
+%{_datadir}/foomatic/db/source/printer/Oki-C*.xml
+%{_datadir}/cups/model/Oki-C*.ppd.gz
+
%doc COPYING ChangeLog INSTALL README manual.pdf
%post
@@ -245,8 +296,9 @@
/bin/rm -f /var/cache/foomatic/*
%changelog
-* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.20070822-2
-- rebuild
+* Wed Mar 24 2008 David Woodhouse <dwmw2(a)infradead.org> 0.20080324-1
+- Update to 20080324
+- add foo2slx and foo2hiperc subpackage
* Wed Aug 29 2007 David Woodhouse <dwmw2(a)infradead.org> 0.20070822-1
- Update to 2007-08-22 release
Index: sources
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 3 Aug 2008 12:25:48 -0000 1.2
+++ sources 3 Aug 2008 13:37:16 -0000 1.3
@@ -1 +1 @@
-b90465102df087afa33e8edd00b0a243 foo2zjs.tar.gz
+85351317f8aa7028f5bbea638a2f7846 foo2zjs.tar.gz