[hplip/f13] Re-create installed hpcups PPDs unconditionally (bug #712241).

Tim Waugh twaugh at fedoraproject.org
Fri Jun 10 10:40:54 UTC 2011


commit dad70eb5365e6e65115ff13f8b5cd51de7b97ce0
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Jun 10 10:54:30 2011 +0100

    Re-create installed hpcups PPDs unconditionally (bug #712241).

 hpcups-update-ppds.sh |    4 ----
 hplip.spec            |    5 ++++-
 2 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/hpcups-update-ppds.sh b/hpcups-update-ppds.sh
index 15b899d..2e97ef5 100644
--- a/hpcups-update-ppds.sh
+++ b/hpcups-update-ppds.sh
@@ -57,10 +57,6 @@ do
     [ -z "${nickname##*, hpcups*}" ] || continue
     $debug && echo "hpcups: true"
 
-    # Does it have an hpPrinterLanguage attribute?
-    grep -q '^\*hpPrinterLanguage:' "$ppd" &>/dev/null && continue
-    $debug && echo "No hpPrinterLanguage attribute"
-
     # No: need to regenerate the PPD.
     if [ ! -f "$tmpdir/models" ]
     then
diff --git a/hplip.spec b/hplip.spec
index e3aefdd..78907a7 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.11.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -516,6 +516,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Fri Jun 10 2011 Tim Waugh <twaugh at redhat.com> 3.11.5-3
+- Re-create installed hpcups PPDs unconditionally (bug #712241).
+
 * Thu May 19 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.5-2
 - Main package requires wget to avoid
   misleading errors about network connectivity (bug #705843).


More information about the scm-commits mailing list