rpms/foo2zjs/F-15 foo2zjs.spec,1.12,1.13

[Cedric OLIVIER]

Author: cquad

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

Modified Files:
	foo2zjs.spec 
Log Message:
Bug 2049 - foo2lava conflcts with foomatic-db 
Removing KONICA_MINOLTA-magicolor_2430_DL.xml



Index: foo2zjs.spec
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-15/foo2zjs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- foo2zjs.spec	6 Nov 2011 19:51:28 -0000	1.12
+++ foo2zjs.spec	22 Nov 2011 20:00:12 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           foo2zjs
 Version:        0.%{foo2zjs_ver}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Linux printer driver for ZjStream protocol
 
 Group:          System Environment/Libraries
@@ -213,6 +213,9 @@
 # Samsung CLP-310 already included in foomatic-db package
 rm foomatic-db/printer/Samsung-CLP-310.xml
 
+# KONICA_MINOLTA-magicolor_2430_DL already included in foomatic-db package
+rm foomatic-db/printer/KONICA_MINOLTA-magicolor_2430_DL.xml
+
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
@@ -307,7 +310,6 @@
 %{_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}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2430_DL.xml
 %{_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
@@ -396,6 +398,9 @@
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Tue Nov 22 2011 Cédric Olivier <cedric.olivier at free.fr> 0.20111105-2
+- Remove KONICA_MINOLTA-magicolor_2430 already in foomatic-db
+
 * Sun Nov 6 2011 Cédric Olivier <cedric.olivier at free.fr> 0.20111105-1
 - Update to latest release
 - updated the C110 ieee1284 string