rpms/foomatic/FC-6 .cvsignore, 1.39, 1.40 foomatic.spec, 1.142, 1.143 sources, 1.39, 1.40 foomatic-badxml.patch, 1.1, NONE foomatic-driver-names.patch, 1.1, NONE foomatic-printoutmode.patch, 1.4, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Nov 3 17:53:41 UTC 2006
- Previous message (by thread): rpms/foomatic/devel .cvsignore,1.40,1.41 sources,1.40,1.41
- Next message (by thread): rpms/doxygen/FC-6 .cvsignore, 1.21, 1.22 doxygen.spec, 1.43, 1.44 sources, 1.21, 1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/dist/rpms/foomatic/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv1361
Modified Files:
.cvsignore foomatic.spec sources
Removed Files:
foomatic-badxml.patch foomatic-driver-names.patch
foomatic-printoutmode.patch
Log Message:
* Fri Nov 3 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-38.1
- Updated db-engine to 3.0-20061031.
- Updated db to 3.0-20061031.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/foomatic/FC-6/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore 21 Apr 2006 11:10:59 -0000 1.39
+++ .cvsignore 3 Nov 2006 17:53:39 -0000 1.40
@@ -29,3 +29,5 @@
foomatic-db-3.0-20060116.tar.gz
foomatic-db-engine-3.0-20060117.tar.gz
foomatic-db-engine-3.0-20060421.tar.gz
+foomatic-db-engine-3.0-20061031.tar.gz
+foomatic-db-3.0-20061031.tar.gz
Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/FC-6/foomatic.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- foomatic.spec 3 Nov 2006 16:02:29 -0000 1.142
+++ foomatic.spec 3 Nov 2006 17:53:39 -0000 1.143
@@ -1,5 +1,5 @@
-%define dbver 20060116
-%define enginever 3.0-20060421
+%define dbver 20061031
+%define enginever 3.0-20061031
%define filtersver 20051209
%define hpijsver 1.5-20051209
@@ -39,12 +39,6 @@
Patch6: foomatic-ppdload.patch
Patch7: foomatic-ppdload-ppd.patch
-# Make CUPS driver work with drivers containing '-' in their names.
-Patch8: foomatic-driver-names.patch
-
-# Don't break gimp-print driver
-Patch9: foomatic-printoutmode.patch
-
# Fix 3.0.2 build.
Patch10: foomatic-db-engine-xml-cflags.patch
@@ -54,9 +48,6 @@
# Handle non-UTF-8 encodings in imported PPD files.
Patch15: foomatic-bad-utf8.patch
-# Fix tag mismatch in db.
-Patch16: foomatic-badxml.patch
-
Url: http://www.linuxprinting.org
BuildRequires: perl >= 3:5.8.1
BuildRequires: libxml2-devel
@@ -107,7 +98,6 @@
chmod a+x mkinstalldirs
%patch2 -p1 -b .libdir
%patch6 -p1 -b .ppdload
-%patch8 -p1 -b .driver-names
%patch14 -p1 -b .ampathxml
%patch10 -p1 -b .xml-cflags
%patch15 -p1
@@ -119,7 +109,6 @@
pushd foomatic-db-%{dbver}
%patch7 -p1 -b .ppdload-ppd
-%patch16 -p1 -b .badxml
%if %with_omni
# Omni printers
@@ -127,21 +116,21 @@
%endif
# Gimp-print-4.2.0 driver info
-rm db/source/driver/stp.xml
pushd db/source
tar xjf %{SOURCE5}
# Fix up 'gimp-print' references to point to 'gimp-print-ijs'.
perl -pi -e 's,>gimp-print<,>gimp-print-ijs<,' printer/*.xml
+# Recommend gimp-print-ijs instead of gutenprint, just until it
+# gets into Core. Anyway, there isn't a 'gutenprint' foomatic driver;
+# instead it's gutenprint-ijs.5.0 or gutenprint-ijs-simplified.5.0
+perl -pi -e 's,>gutenprint<,>gimp-print-ijs<,' printer/*.xml
+
# Remove references to foo2zjs and foo2oak (bug #208851).
find printer -name '*.xml' |xargs grep -l '<driver>foo2'|xargs rm -f
rm -f driver/foo2zjs.xml driver/foo2oak.xml
popd
-rm -f db/source/opt/gimp-print-printoutmode.xml
-%patch9 -p1 -b .printoutmode
-
-popd
%build
export LIB_CUPS=/usr/lib/cups # /usr/lib NOT libdir
@@ -284,6 +273,8 @@
%changelog
* Fri Nov 3 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-38.1
+- Updated db-engine to 3.0-20061031.
+- Updated db to 3.0-20061031.
- Remove references to foo2zjs and foo2oak (bug #208851).
* Thu Aug 3 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-38
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/foomatic/FC-6/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources 21 Apr 2006 11:11:03 -0000 1.39
+++ sources 3 Nov 2006 17:53:39 -0000 1.40
@@ -2,5 +2,5 @@
dcfbfbe16d76d0b6e44cb261fccd138f Omni-printers-0.9.2.tar.bz2
5876178c3aefd36102bc5eef575d3f9c foomatic-filters-3.0-20051209.tar.gz
8c217af8a570124d9ad7f8a4b1270ebe foomatic-db-hpijs-1.5-20051209.tar.gz
-54ae910edbb0ed3816cebe05a0f0b605 foomatic-db-3.0-20060116.tar.gz
-54e5a0daf74d9d0e851069f54f5b6995 foomatic-db-engine-3.0-20060421.tar.gz
+0e72faf4d098cfc37f16467edf6c2570 foomatic-db-engine-3.0-20061031.tar.gz
+0dc1e660c2860d0c0ea38144e26f8288 foomatic-db-3.0-20061031.tar.gz
--- foomatic-badxml.patch DELETED ---
--- foomatic-driver-names.patch DELETED ---
--- foomatic-printoutmode.patch DELETED ---
- Previous message (by thread): rpms/foomatic/devel .cvsignore,1.40,1.41 sources,1.40,1.41
- Next message (by thread): rpms/doxygen/FC-6 .cvsignore, 1.21, 1.22 doxygen.spec, 1.43, 1.44 sources, 1.21, 1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list