rpms/foomatic/F-8 .cvsignore, 1.53, 1.54 foomatic-2.0.2-fontpath.patch, 1.3, 1.4 foomatic-filters-libdir.patch, 1.5, 1.6 foomatic.spec, 1.178, 1.179 sources, 1.56, 1.57 foomatic-459847.patch, 1.1, NONE foomatic-ampathxml.patch, 1.1, NONE foomatic-busyloop.patch, 1.1, NONE foomatic-clean-up-on-cancel.patch, 1.1, NONE foomatic-db-engine-xml-cflags.patch, 1.1, NONE foomatic-hpclj9500mfp.patch, 1.1, NONE foomatic-ieee1284.patch, 1.1, NONE foomatic-ppdload-ppd.patch, 1.1, NONE foomatic-ppdload.patch, 1.2, NONE foomatic-ppdopts, 1.1, NONE
Tim Waugh
twaugh at fedoraproject.org
Fri Sep 5 12:51:33 UTC 2008
- Previous message: rpms/samefile/F-8 import.log, NONE, 1.1 samefile.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/python-lxml/F-9 .cvsignore, 1.17, 1.18 python-lxml.spec, 1.23, 1.24 sources, 1.17, 1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/pkgs/rpms/foomatic/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31554
Modified Files:
.cvsignore foomatic-2.0.2-fontpath.patch
foomatic-filters-libdir.patch foomatic.spec sources
Removed Files:
foomatic-459847.patch foomatic-ampathxml.patch
foomatic-busyloop.patch foomatic-clean-up-on-cancel.patch
foomatic-db-engine-xml-cflags.patch
foomatic-hpclj9500mfp.patch foomatic-ieee1284.patch
foomatic-ppdload-ppd.patch foomatic-ppdload.patch
foomatic-ppdopts
Log Message:
Sync to rawhide package.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-8/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore 9 Jan 2008 17:55:37 -0000 1.53
+++ .cvsignore 5 Sep 2008 12:51:02 -0000 1.54
@@ -49,3 +49,7 @@
foomatic-db-engine-3.0-20071218.tar.gz
foomatic-db-3.0-20071218.tar.gz
foomatic-db-hpijs-20071218.tar.gz
+foomatic-db-engine-3.0-20080904.tar.gz
+foomatic-filters-3.0-20080904.tar.gz
+foomatic-db-3.0-20080904.tar.gz
+foomatic-db-hpijs-20080904.tar.gz
foomatic-2.0.2-fontpath.patch:
Index: foomatic-2.0.2-fontpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-8/foomatic-2.0.2-fontpath.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- foomatic-2.0.2-fontpath.patch 14 Jun 2007 09:35:27 -0000 1.3
+++ foomatic-2.0.2-fontpath.patch 5 Sep 2008 12:51:02 -0000 1.4
@@ -1,10 +1,11 @@
---- foomatic-filters-3.0-20070614/foomatic-gswrapper.in.fontpath 2007-06-14 08:20:15.000000000 +0100
-+++ foomatic-filters-3.0-20070614/foomatic-gswrapper.in 2007-06-14 10:33:10.000000000 +0100
-@@ -24,6 +24,7 @@
+diff -up foomatic-filters-3.0-20080710/foomatic-gswrapper.in.fontpath foomatic-filters-3.0-20080710/foomatic-gswrapper.in
+--- foomatic-filters-3.0-20080710/foomatic-gswrapper.in.fontpath 2008-07-10 08:20:17.000000000 +0100
++++ foomatic-filters-3.0-20080710/foomatic-gswrapper.in 2008-09-02 13:14:12.000000000 +0100
+@@ -24,6 +24,7 @@ my $execpath = "@EXECPATH@";
# Get execution path from config file
$execpath = $conf{execpath} if defined(%conf) and defined $conf{execpath};
$ENV{'PATH'} = $execpath;
+$ENV{'GS_FONTPATH'} = '/usr/share/fonts';
- # Check whether we have a GhostScript version with redirection of the
+ # Check whether we have a Ghostscript version with redirection of the
# standard output of the PostScript programs via '-sstdout=%stderr'
foomatic-filters-libdir.patch:
Index: foomatic-filters-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-8/foomatic-filters-libdir.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- foomatic-filters-libdir.patch 14 Jun 2007 09:35:27 -0000 1.5
+++ foomatic-filters-libdir.patch 5 Sep 2008 12:51:03 -0000 1.6
@@ -1,6 +1,7 @@
---- foomatic-filters-3.0-20070614/configure.ac.libdir 2007-06-14 08:20:15.000000000 +0100
-+++ foomatic-filters-3.0-20070614/configure.ac 2007-06-14 10:30:50.000000000 +0100
-@@ -13,7 +13,7 @@
+diff -up foomatic-filters-3.0-20080710/configure.ac.libdir foomatic-filters-3.0-20080710/configure.ac
+--- foomatic-filters-3.0-20080710/configure.ac.libdir 2008-07-10 08:20:16.000000000 +0100
++++ foomatic-filters-3.0-20080710/configure.ac 2008-09-02 13:13:36.000000000 +0100
+@@ -13,7 +13,7 @@ AC_PROG_LN_S
AC_PROG_MAKE_SET
ETCSEARCHPATH=${prefix}/etc:/usr/etc:/usr/local/etc
@@ -9,7 +10,7 @@
dnl Get the operating system and version number...
uname=`uname`
-@@ -47,13 +47,13 @@
+@@ -47,13 +47,13 @@ dnl Check for /usr/lib/cups/backend
AC_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$LIBSEARCHPATH)
dnl Check for /usr/lib/ppr
Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-8/foomatic.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- foomatic.spec 2 Sep 2008 16:03:49 -0000 1.178
+++ foomatic.spec 5 Sep 2008 12:51:03 -0000 1.179
@@ -1,12 +1,12 @@
-%define dbver 20080211
-%define enginever 3.0-20080211
-%define filtersver 20080211
-%define hpijsver 20080211
+%define dbver 20080904
+%define enginever 3.0-20080904
+%define filtersver 20080904
+%define hpijsver 20080904
Summary: Foomatic printer database.
Name: foomatic
Version: 3.0.2
-Release: 62%{?dist}
+Release: 65%{?dist}
License: GPLv2+
Group: System Environment/Libraries
@@ -14,7 +14,7 @@
# NOW=`date '+%Y%m%d'`
# cvs -d:pserver:anonymous at cvs.linuxprinting.org:/usr/local/cvs export -D $NOW foomatic
# tar cjf foomatic-1.9-$NOW.tar.bz2 foomatic
-Source0: http://www.linuxprinting.org/download/foomatic/foomatic-db-engine-%{enginever}.tar.gz
+Source0: http://www.openprinting.org/download/foomatic/foomatic-db-engine-%{enginever}.tar.gz
Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-3.0-%{filtersver}.tar.gz
Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-3.0-%{dbver}.tar.gz
@@ -27,29 +27,11 @@
# Set GS_FONTPATH in gs wrapper (bug #81410).
Patch5: foomatic-2.0.2-fontpath.patch
-# Reinstate ppdload long enough for me to work around its disappearance.
-Patch6: foomatic-ppdload.patch
-Patch7: foomatic-ppdload-ppd.patch
-
-# Fix 3.0.2 build.
-Patch10: foomatic-db-engine-xml-cflags.patch
-
-# Make foomatic-db-engine build.
-Patch14: foomatic-ampathxml.patch
-
# Handle non-UTF-8 encodings in imported PPD files.
Patch15: foomatic-bad-utf8.patch
-# Missing IEEE 1284 IDs.
-Patch16: foomatic-ieee1284.patch
-
-Patch17: foomatic-clean-up-on-cancel.patch
Patch18: foomatic-sigpipe.patch
-Patch19: foomatic-459847.patch
-Patch20: foomatic-busyloop.patch
-Patch21: foomatic-hpclj9500mfp.patch
-
Url: http://www.linuxprinting.org
BuildRequires: perl >= 3:5.8.1
BuildRequires: perl(ExtUtils::MakeMaker)
@@ -93,7 +75,6 @@
pushd foomatic-filters-3.0-%{filtersver}
%patch1 -p1 -b .libdir
%patch5 -p1 -b .fontpath
-%patch17 -p1 -b .clean-up-on-cancel
%patch18 -p1 -b .sigpipe
./make_configure
popd
@@ -101,11 +82,7 @@
pushd foomatic-db-engine-%{enginever}
chmod a+x mkinstalldirs
%patch2 -p1 -b .libdir
-%patch6 -p1 -b .ppdload
-%patch14 -p1 -b .ampathxml
-%patch10 -p1 -b .xml-cflags
%patch15 -p1
-%patch20 -p1 -b .busyloop
./make_configure
popd
@@ -113,11 +90,6 @@
popd
pushd foomatic-db-%{dbver}
-%patch7 -p1 -b .ppdload-ppd
-
-%patch16 -p1 -b .ieee1284
-%patch19 -p1 -b .459847
-%patch21 -p1 -b .hpclj9500mfp
cd db/source
@@ -228,6 +200,8 @@
mkdir $RPM_BUILD_ROOT%{_datadir}/foomatic/db/source/PPD/Custom
mkdir -p $RPM_BUILD_ROOT%{_var}/cache/foomatic
+echo cups > $RPM_BUILD_ROOT%{_sysconfdir}/foomatic/defaultspooler
+
# Remove things we don't ship.
rm -rf $RPM_BUILD_ROOT%{_libdir}/perl5/site_perl \
$RPM_BUILD_ROOT%{_libdir}/ppr \
@@ -246,6 +220,7 @@
%doc --parents */README */USAGE */ChangeLog
%dir %{_sysconfdir}/foomatic
%config(noreplace) %{_sysconfdir}/foomatic/filter.conf
+%config(noreplace) %{_sysconfdir}/foomatic/defaultspooler
%{_bindir}/*
%{_sbindir}/*
%{_prefix}/lib*/perl5/vendor_perl/*/Foomatic
@@ -257,16 +232,38 @@
%{_var}/cache/foomatic
%changelog
-* Tue Sep 2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-62
+* Thu Sep 4 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-65
+- Removed ampathxml and xml-cflags patches.
+- Updated db-hpijs to 20080904.
+- Updated db to 20080904.
+- Updated filters to 3.0-20080904.
+- Updated db-engine to 3.0-20080904.
+
+* Wed Sep 3 2008 Tim Waugh <twaugh at redhat.com>
+- Finally remove ppdload.
+
+* Tue Sep 2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-64
- Fixed typo in HP-Color_LaserJet_9500_MFP.xml.
-* Tue Sep 2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-61
+* Tue Sep 2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-63
- Avoid busy-looping when trying to shorten long PPD nicknames.
-* Tue Sep 2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-60
+* Tue Sep 2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-62
+- Removed patch fuzz.
- Fixed PPD generation for HP LaserJet 4345 MFP (bug #459847).
-* Thu May 8 2008 Tim Waugh <twaugh at redhat.com>
+* Thu Jul 10 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-61
+- Updated db-hpijs to 20080710.
+- Updated db to 20080710.
+- Updated filters to 3.0-20080710.
+- Updated db-engine to 3.0-20080710.
+- Ship a defaultspooler file to avoid the need for spooler
+ auto-detection (bug #454684).
+
+* Thu May 8 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-60
+- Updated filters to 3.0-20080507.
+
+* Wed May 7 2008 Tim Waugh <twaugh at redhat.com>
- Avoid busy-looping when the CUPS backend stops (bug #445555).
* Tue Apr 1 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-59
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-8/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources 1 Apr 2008 13:19:15 -0000 1.56
+++ sources 5 Sep 2008 12:51:03 -0000 1.57
@@ -1,4 +1,4 @@
-5d827cd3d95807c28609d49a5c412c29 foomatic-db-3.0-20080211.tar.gz
-ba8b08913589568f85548998f6321f95 foomatic-db-engine-3.0-20080211.tar.gz
-58bef426f769219592b6b0c81357a04a foomatic-db-hpijs-20080211.tar.gz
-97b517e94ac85534cdc84a446a872bc2 foomatic-filters-3.0-20080211.tar.gz
+d46d1a26a8199c8c5c618ad2cd17a68a foomatic-db-engine-3.0-20080904.tar.gz
+ce3332981735ce5b50932640a6107220 foomatic-filters-3.0-20080904.tar.gz
+758ac14a7068a3c2016608d35c8994c7 foomatic-db-3.0-20080904.tar.gz
+a46f919c711547181d651509d771967e foomatic-db-hpijs-20080904.tar.gz
--- foomatic-459847.patch DELETED ---
--- foomatic-ampathxml.patch DELETED ---
--- foomatic-busyloop.patch DELETED ---
--- foomatic-clean-up-on-cancel.patch DELETED ---
--- foomatic-db-engine-xml-cflags.patch DELETED ---
--- foomatic-hpclj9500mfp.patch DELETED ---
--- foomatic-ieee1284.patch DELETED ---
--- foomatic-ppdload-ppd.patch DELETED ---
--- foomatic-ppdload.patch DELETED ---
--- foomatic-ppdopts DELETED ---
- Previous message: rpms/samefile/F-8 import.log, NONE, 1.1 samefile.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/python-lxml/F-9 .cvsignore, 1.17, 1.18 python-lxml.spec, 1.23, 1.24 sources, 1.17, 1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list