rpms/foomatic
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Updated db-hpijs to 20081124.

Browse Source 
- Updated db to 20081124.
- Updated filters to 3.0-20081124.
- Updated db-engine to 3.0-20081124.
This commit is contained in:
Tim Waugh 2008-12-04 16:49:31 +00:00
parent 6a16f057d4
commit d58d474549
4 changed files with 18 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cvsignore
View File

@ -62,3 +62,7 @@ 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-db-engine-3.0-20081124.tar.gz
foomatic-filters-3.0-20081124.tar.gz
foomatic-db-3.0-20081124.tar.gz
foomatic-db-hpijs-20081124.tar.gz

35
foomatic-ppd-filenames.patch
View File

@ -1,35 +0,0 @@
diff -U0 foomatic-filters-3.0-20080904/ChangeLog.ppd-filenames foomatic-filters-3.0-20080904/ChangeLog
--- foomatic-filters-3.0-20080904/ChangeLog.ppd-filenames 2008-09-04 08:20:14.000000000 +0100
+++ foomatic-filters-3.0-20080904/ChangeLog 2008-09-05 15:51:23.000000000 +0100
@@ -0,0 +1,6 @@
+2008-09-05 Till Kamppeter <till.kamppeter@gmail.com>
+
+ * foomatic-rip.in: Make foomatic-rip also working with PPD file
+ names which contain brackets or other special characters (Bug
+ #169).
+
diff -up foomatic-filters-3.0-20080904/foomatic-rip.in.ppd-filenames foomatic-filters-3.0-20080904/foomatic-rip.in
--- foomatic-filters-3.0-20080904/foomatic-rip.in.ppd-filenames 2008-09-05 15:49:54.000000000 +0100
+++ foomatic-filters-3.0-20080904/foomatic-rip.in 2008-09-05 15:51:23.000000000 +0100
@@ -517,10 +517,10 @@ if (defined($ENV{'PRINTCAP_ENTRY'})){
# PPD file name given via the command line
# allow duplicates, and use the last specified one
while ( ($spooler ne 'lprng') and ($argstr =~ s/\x01-p(\x01|)([^\x01]+)\x01/\x01/)) {
- $ppdfile = removeshellescapes($2);
+ $ppdfile = $2;
}
while ($argstr =~ s/\x01--ppd(\x01|=|)([^\x01]+)\x01/\x01/) {
- $ppdfile = removeshellescapes($2);
+ $ppdfile = $2;
}
# Check for LPD/GNUlpr by typical options which the spooler puts onto
@@ -818,7 +818,7 @@ if (($spooler eq 'lpd') ||
($spooler eq 'gnulpr')) {
# Get PPD file name as the last command line argument
- $ppdfile = removeshellescapes($rargs[$#rargs]);
+ $ppdfile = $rargs[$#rargs];
}

19
foomatic.spec
View File

@ -1,12 +1,12 @@
%define dbver 20080904
%define enginever 3.0-20080904
%define filtersver 20080904
%define hpijsver 20080904
%define dbver 20081124
%define enginever 3.0-20081124
%define filtersver 20081124
%define hpijsver 20081124
Summary: Database of printers and printer drivers
Name: foomatic
Version: 3.0.2
Release: 67%{?dist}
Release: 68%{?dist}
License: GPLv2+
Group: System Environment/Libraries
@ -32,8 +32,6 @@ Patch15: foomatic-bad-utf8.patch
Patch18: foomatic-sigpipe.patch
Patch19: foomatic-ppd-filenames.patch
Url: http://www.linuxprinting.org
BuildRequires: perl >= 3:5.8.1
BuildRequires: perl(ExtUtils::MakeMaker)
@ -78,7 +76,6 @@ pushd foomatic-filters-3.0-%{filtersver}
%patch1 -p1 -b .libdir
%patch5 -p1 -b .fontpath
%patch18 -p1 -b .sigpipe
%patch19 -p1 -b .ppd-filenames
./make_configure
popd
@ -235,7 +232,11 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
%{_var}/cache/foomatic
%changelog
* Mon Nov 24 2008 Tim Waugh <twaugh@redhat.com>
* Thu Dec 3 2008 Tim Waugh <twaugh@redhat.com> 3.0.2-68
- Updated db-hpijs to 20081124.
- Updated db to 20081124.
- Updated filters to 3.0-20081124.
- Updated db-engine to 3.0-20081124.
- Better build root.
- Fixed summary.

8
sources
View File

@ -1,4 +1,4 @@
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
6921245dfdafa634cdd9587cd78fe13b foomatic-db-engine-3.0-20081124.tar.gz
0d1ef15005832b96c5ef4be5944405ee foomatic-filters-3.0-20081124.tar.gz
4706663cfd821193310ac65ebb7e0bd6 foomatic-db-3.0-20081124.tar.gz
596dc481e325bbd4eb0ae8a9424d9b26 foomatic-db-hpijs-20081124.tar.gz