rpms/foo2zjs/F-13 .cvsignore, 1.6, 1.7 foo2zjs-dynamic-jbig.patch, 1.4, 1.5 foo2zjs.spec, 1.9, 1.10 sources, 1.7, 1.8

Cedric OLIVIER cquad at rpmfusion.org
Wed Jun 8 19:21:54 CEST 2011 

Author: cquad

Update of /cvs/free/rpms/foo2zjs/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6337/F-13

Modified Files:
	.cvsignore foo2zjs-dynamic-jbig.patch foo2zjs.spec sources 
Log Message:
Update to 20110602 version



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-13/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Nov 2010 17:18:31 -0000	1.6
+++ .cvsignore	8 Jun 2011 17:21:51 -0000	1.7
@@ -1 +1 @@
-foo2zjs-20101016.tar.gz
+foo2zjs-20110602.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(-)

Index: foo2zjs-dynamic-jbig.patch
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-13/foo2zjs-dynamic-jbig.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- foo2zjs-dynamic-jbig.patch	3 Nov 2010 17:18:31 -0000	1.4
+++ foo2zjs-dynamic-jbig.patch	8 Jun 2011 17:21:53 -0000	1.5
@@ -1,5 +1,5 @@
-diff -uNr foo2zjs.original/jbig_ar.c foo2zjs/jbig_ar.c
---- foo2zjs.original/jbig_ar.c	2008-09-05 17:05:54.000000000 +0200
+diff -uNr foo2zjs-patch1/jbig_ar.c foo2zjs/jbig_ar.c
+--- foo2zjs-patch1/jbig_ar.c	2008-09-05 17:05:54.000000000 +0200
 +++ foo2zjs/jbig_ar.c	1970-01-01 01:00:00.000000000 +0100
 @@ -1,426 +0,0 @@
 -/*
@@ -428,8 +428,8 @@
 -
 -  return pix;
 -}
-diff -uNr foo2zjs.original/jbig_ar.h foo2zjs/jbig_ar.h
---- foo2zjs.original/jbig_ar.h	2008-09-05 17:05:54.000000000 +0200
+diff -uNr foo2zjs-patch1/jbig_ar.h foo2zjs/jbig_ar.h
+--- foo2zjs-patch1/jbig_ar.h	2008-09-05 17:05:54.000000000 +0200
 +++ foo2zjs/jbig_ar.h	1970-01-01 01:00:00.000000000 +0100
 @@ -1,55 +0,0 @@
 -/*
@@ -487,8 +487,8 @@
 -int  arith_decode(struct jbg_ardec_state *s, int cx);
 -
 -#endif /* JBG_AR_H */
-diff -uNr foo2zjs.original/jbig.c foo2zjs/jbig.c
---- foo2zjs.original/jbig.c	2008-09-05 17:06:03.000000000 +0200
+diff -uNr foo2zjs-patch1/jbig.c foo2zjs/jbig.c
+--- foo2zjs-patch1/jbig.c	2008-09-05 17:06:03.000000000 +0200
 +++ foo2zjs/jbig.c	1970-01-01 01:00:00.000000000 +0100
 @@ -1,3289 +0,0 @@
 -/*
@@ -3780,8 +3780,8 @@
 -  }
 -  return JBG_EINVAL | 0;
 -}
-diff -uNr foo2zjs.original/jbig.h foo2zjs/jbig.h
---- foo2zjs.original/jbig.h	2008-09-05 17:06:03.000000000 +0200
+diff -uNr foo2zjs-patch1/jbig.h foo2zjs/jbig.h
+--- foo2zjs-patch1/jbig.h	2008-09-05 17:06:03.000000000 +0200
 +++ foo2zjs/jbig.h	1970-01-01 01:00:00.000000000 +0100
 @@ -1,233 +0,0 @@
 -/*
@@ -4017,9 +4017,9 @@
 -int jbg_newlen(unsigned char *bie, size_t len);
 -
 -#endif /* JBG_H */
-diff -uNr foo2zjs.original/Makefile foo2zjs/Makefile
---- foo2zjs.original/Makefile	2010-08-17 17:14:59.000000000 +0200
-+++ foo2zjs/Makefile	2010-09-15 18:53:19.666288601 +0200
+diff -uNr foo2zjs-patch1/Makefile foo2zjs/Makefile
+--- foo2zjs-patch1/Makefile	2011-06-03 23:05:12.000000000 +0200
++++ foo2zjs/Makefile	2011-06-07 23:13:42.242002026 +0200
 @@ -19,7 +19,6 @@
  # Installation prefix...
  PREFIX=/usr/local
@@ -4048,8 +4048,8 @@
  		zjsdecode.c \
  		zjsdecode.1in \
  		zjs.h \
-@@ -266,7 +261,7 @@
- MANPAGES+=	gipddecode.1
+@@ -273,7 +268,7 @@
+ MANPAGES+=	hbpldecode.1
  MANPAGES+=	foo2zjs-pstops.1 arm2hpdl.1 usb_printerid.1
  MANPAGES+=	printer-profile.1
 -LIBJBG	=	jbig.o jbig_ar.o
@@ -4057,94 +4057,98 @@
  BINPROGS=
  
  ifeq ($(UNAME),Linux)
-@@ -403,29 +398,29 @@
+@@ -420,29 +415,29 @@
  	@echo "yourself."
  
  
 -foo2zjs: foo2zjs.o $(LIBJBG)
-+foo2zjs: foo2zjs.o
++foo2zjs: foo2zjs.o 
  	$(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG)
  
 -foo2hp: foo2hp.o $(LIBJBG)
-+foo2hp: foo2hp.o
++foo2hp: foo2hp.o 
  	# $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) /usr/local/lib/libdmalloc.a
  	$(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG)
  
 -foo2xqx: foo2xqx.o $(LIBJBG)
-+foo2xqx: foo2xqx.o
++foo2xqx: foo2xqx.o 
  	$(CC) $(CFLAGS) -o $@ foo2xqx.o $(LIBJBG)
  
 -foo2lava: foo2lava.o $(LIBJBG)
-+foo2lava: foo2lava.o
++foo2lava: foo2lava.o 
  	$(CC) $(CFLAGS) -o $@ foo2lava.o $(LIBJBG)
  
 -foo2qpdl: foo2qpdl.o $(LIBJBG)
-+foo2qpdl: foo2qpdl.o
++foo2qpdl: foo2qpdl.o 
  	$(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG)
  
 -foo2oak: foo2oak.o $(LIBJBG)
-+foo2oak: foo2oak.o
++foo2oak: foo2oak.o 
  	$(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG)
  
 -foo2slx: foo2slx.o $(LIBJBG)
-+foo2slx: foo2slx.o
++foo2slx: foo2slx.o 
  	$(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG)
  
 -foo2hiperc: foo2hiperc.o $(LIBJBG)
-+foo2hiperc: foo2hiperc.o
++foo2hiperc: foo2hiperc.o 
  	$(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG)
  
  
-@@ -488,37 +483,37 @@
- all-icc2ps:
- 	cd icc2ps; $(MAKE) all
+@@ -510,40 +505,40 @@
+ 	cd osx-hotplug; $(MAKE) all
+ endif
  
 -ok: ok.o $(LIBJBG)
-+ok: ok.o
++ok: ok.o 
  	$(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@
  
--zjsdecode: zjsdecode.o $(LIBJBG)
-+zjsdecode: zjsdecode.o
- 	$(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@
+-gipddecode: gipddecode.o $(LIBJBG)
++gipddecode: gipddecode.o 
+ 	$(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@
+ 
+-hbpldecode: hbpldecode.o $(LIBJBG)
++hbpldecode: hbpldecode.o 
+ 	$(CC) $(CFLAGS) hbpldecode.o $(LIBJBG) -o $@
  
 -hipercdecode: hipercdecode.o $(LIBJBG)
-+hipercdecode: hipercdecode.o
++hipercdecode: hipercdecode.o 
  	$(CC) $(CFLAGS) hipercdecode.o $(LIBJBG) -o $@
  
--splcdecode: splcdecode.o $(LIBJBG)
-+splcdecode: splcdecode.o
- 	$(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@
- 
--xqxdecode: xqxdecode.o $(LIBJBG)
-+xqxdecode: xqxdecode.o
- 	$(CC) $(CFLAGS) xqxdecode.o $(LIBJBG) -o $@
- 
 -lavadecode: lavadecode.o $(LIBJBG)
-+lavadecode: lavadecode.o
++lavadecode: lavadecode.o 
  	$(CC) $(CFLAGS) lavadecode.o $(LIBJBG) -o $@
  
--qpdldecode: qpdldecode.o $(LIBJBG)
-+qpdldecode: qpdldecode.o
- 	$(CC) $(CFLAGS) qpdldecode.o $(LIBJBG) -o $@
+-oakdecode: oakdecode.o $(LIBJBG)
++oakdecode: oakdecode.o 
+ 	$(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@
  
 -opldecode: opldecode.o $(LIBJBG)
-+opldecode: opldecode.o
++opldecode: opldecode.o 
  	$(CC) $(CFLAGS) -g opldecode.o $(LIBJBG) -o $@
  
--oakdecode: oakdecode.o $(LIBJBG)
-+oakdecode: oakdecode.o
- 	$(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@
+-qpdldecode: qpdldecode.o $(LIBJBG)
++qpdldecode: qpdldecode.o 
+ 	$(CC) $(CFLAGS) qpdldecode.o $(LIBJBG) -o $@
+ 
+-splcdecode: splcdecode.o $(LIBJBG)
++splcdecode: splcdecode.o 
+ 	$(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@
  
 -slxdecode: slxdecode.o $(LIBJBG)
-+slxdecode: slxdecode.o
++slxdecode: slxdecode.o 
  	$(CC) $(CFLAGS) slxdecode.o $(LIBJBG) -o $@
  
--gipddecode: gipddecode.o $(LIBJBG)
-+gipddecode: gipddecode.o
- 	$(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@
+-xqxdecode: xqxdecode.o $(LIBJBG)
++xqxdecode: xqxdecode.o 
+ 	$(CC) $(CFLAGS) xqxdecode.o $(LIBJBG) -o $@
+ 
+-zjsdecode: zjsdecode.o $(LIBJBG)
++zjsdecode: zjsdecode.o 
+ 	$(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@
  
  command2foo2lava-pjl: command2foo2lava-pjl.o
-@@ -797,9 +792,9 @@
+@@ -834,9 +829,9 @@
  	    done; \
  	fi
  
@@ -4157,7 +4161,7 @@
  
  install-desktop:
  	#
-@@ -987,7 +982,7 @@
+@@ -1051,7 +1046,7 @@
  	-rm -f $(PROGS) $(BINPROGS) $(SHELLS)
  	-rm -f *.zc *.zm
  	-rm -f xxx.* xxxomatic
@@ -4166,7 +4170,7 @@
  	-rm -f foo2oak.o oakdecode.o
  	-rm -f foo2xqx.o xqxdecode.o
  	-rm -f foo2lava.o lavadecode.o
-@@ -1013,23 +1008,23 @@
+@@ -1078,24 +1073,24 @@
  #
  # Header dependencies
  #
@@ -4181,29 +4185,31 @@
 -foo2slx.o: slx.h jbig.h
 -foo2hiperc.o: jbig.h hiperc.h
 -hipercdecode.o: hiperc.h jbig.h
+-hbpldecode.o: 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
 -gipddecode.o: slx.h jbig.h
-+zjsdecode.o: zjs.h
-+foo2zjs.o: zjs.h
-+foo2oak.o: oak.h
++zjsdecode.o: zjs.h 
++foo2zjs.o: zjs.h 
++foo2oak.o: oak.h 
 +jbig.o: 
 +foo2hp.o: zjs.h cups.h
-+foo2xqx.o: xqx.h
-+foo2lava.o:
++foo2xqx.o: xqx.h 
++foo2lava.o: 
 +foo2qpdl.o: qpdl.h
-+foo2slx.o: slx.h
++foo2slx.o: slx.h 
 +foo2hiperc.o: hiperc.h
-+hipercdecode.o: hiperc.h
-+lavadecode.o:
-+qpdldecode.o:
-+opldecode.o:
-+slxdecode.o: slx.h
-+xqxdecode.o: xqx.h
-+gipddecode.o: slx.h
++hipercdecode.o: hiperc.h 
++hbpldecode.o: 
++lavadecode.o: 
++qpdldecode.o: 
++opldecode.o: 
++slxdecode.o: slx.h 
++xqxdecode.o: xqx.h 
++gipddecode.o: slx.h 
  
  #
  # foo2* Regression tests


Index: foo2zjs.spec
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-13/foo2zjs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- foo2zjs.spec	3 Nov 2010 17:18:31 -0000	1.9
+++ foo2zjs.spec	8 Jun 2011 17:21:54 -0000	1.10
@@ -1,4 +1,4 @@
-%define foo2zjs_ver 20101016
+%define foo2zjs_ver 20110602
 
 Name:           foo2zjs
 Version:        0.%{foo2zjs_ver}
@@ -14,6 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  jbigkit-devel groff ghostscript
+BuildRequires:  bc
 Requires:       lcms
 Requires:       argyllcms
 Requires(post): /bin/rm
@@ -242,6 +243,7 @@
 %{_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
@@ -250,12 +252,14 @@
 %{_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,-)
@@ -310,7 +314,9 @@
 %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
@@ -381,6 +387,16 @@
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Thu Jun 7 2011 Cédric Olivier <cedric.olivier at 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 at 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 at free.fr> 0.20101016-1
 - Update to last release
 - Remove Samsung-CLP-310.xml which conflict with foomatic-db package


Index: sources
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-13/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Nov 2010 17:18:32 -0000	1.7
+++ sources	8 Jun 2011 17:21:54 -0000	1.8
@@ -1 +1 @@
-00907246dab06daa16a4cab29c4d6ddd  foo2zjs-20101016.tar.gz
+cc9036f77bf3eff973207d7325fee192  foo2zjs-20110602.tar.gz

More information about the rpmfusion-commits mailing list