From 33a0ba5486c478a95f8362e3b1282767f4975de6 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Tue, 23 Dec 2008 11:38:18 +0000
Subject: [PATCH] - 2.8.12.

---
 hplip-no-root-config.patch | 48 ++++----------------------------------
 hplip.spec                 | 19 +++++++++++++--
 2 files changed, 21 insertions(+), 46 deletions(-)

diff --git a/hplip-no-root-config.patch b/hplip-no-root-config.patch
index a1d5bce..20f2cc4 100644
--- a/hplip-no-root-config.patch
+++ b/hplip-no-root-config.patch
@@ -1,7 +1,7 @@
-diff -up hplip-2.7.7/base/g.py.no-root-config hplip-2.7.7/base/g.py
---- hplip-2.7.7/base/g.py.no-root-config	2007-06-18 17:56:32.000000000 +0100
-+++ hplip-2.7.7/base/g.py	2007-09-25 15:23:23.000000000 +0100
-@@ -105,6 +105,10 @@ class Config(dict):
+diff -up hplip-2.8.12/base/g.py.no-root-config hplip-2.8.12/base/g.py
+--- hplip-2.8.12/base/g.py.no-root-config	2008-12-17 20:41:12.000000000 +0000
++++ hplip-2.8.12/base/g.py	2008-12-23 10:19:44.000000000 +0000
+@@ -107,6 +107,10 @@ class Config(dict):
  
          log.debug("Reading config file %s" % filename)
  
@@ -12,43 +12,3 @@ diff -up hplip-2.7.7/base/g.py.no-root-config hplip-2.7.7/base/g.py
          try:
              f = file(filename, 'r')
              self.config_obj.readfp(f)
-@@ -134,23 +138,25 @@ class Config(dict):
- # Config file: directories and ports
- prop.sys_config_file = '/etc/hp/hplip.conf'
- prop.user_dir = os.path.expanduser('~/.hplip')
--
--os.umask(0037)
--try:
--    if not os.path.exists(prop.user_dir):
--        os.makedirs(prop.user_dir)
--except OSError:
--    pass # This is sometimes OK, if running hpfax: for example
--    
- prop.user_config_file = os.path.join(prop.user_dir, 'hplip.conf')
- 
--if not os.path.exists(prop.user_config_file):
-+if (not (prop.user_config_file.startswith ("/root/") or
-+         prop.user_config_file.startswith ("/var/")) and
-+    not os.getuid () == 0):
-+    os.umask(0037)
-     try:
--        file(prop.user_config_file, 'w').close()
--        s = os.stat(os.path.dirname(prop.user_config_file))
--        os.chown(prop.user_config_file, s[stat.ST_UID], s[stat.ST_GID])
--    except IOError:
--        pass
-+        if not os.path.exists(prop.user_dir):
-+            os.makedirs(prop.user_dir)
-+    except OSError:
-+        pass # This is sometimes OK, if running hpfax: for example
-+    
-+    if not os.path.exists(prop.user_config_file):
-+        try:
-+            file(prop.user_config_file, 'w').close()
-+            s = os.stat(os.path.dirname(prop.user_config_file))
-+            os.chown(prop.user_config_file, s[stat.ST_UID], s[stat.ST_GID])
-+        except IOError:
-+            pass
-     
- sys_cfg = Config(prop.sys_config_file, True)
- user_cfg = Config(prop.user_config_file)
diff --git a/hplip.spec b/hplip.spec
index 7cdf5ef..2020996 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 2.8.10
-Release: 2%{?dist}
+Version: 2.8.12
+Release: 1%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -183,19 +183,25 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %doc COPYING doc/*
 %{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
+%{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
 %dir %{_sysconfdir}/hp
 %config(noreplace) %{_sysconfdir}/hp/hplip.conf
 %{_bindir}/hp-align
 %{_bindir}/hp-clean
 %{_bindir}/hp-colorcal
+%{_bindir}/hp-devicesetup
 %{_bindir}/hp-fab
+%{_bindir}/hp-faxsetup
 %{_bindir}/hp-firmware
 %{_bindir}/hp-info
 %{_bindir}/hp-levels
+%{_bindir}/hp-linefeedcal
 %{_bindir}/hp-makecopies
 %{_bindir}/hp-makeuri
 %{_bindir}/hp-mkuri
 %{_bindir}/hp-plugin
+%{_bindir}/hp-pqdiag
+%{_bindir}/hp-printsettings
 %{_bindir}/hp-probe
 %{_bindir}/hp-scan
 %{_bindir}/hp-sendfax
@@ -212,16 +218,22 @@ rm -rf %{buildroot}
 %{_datadir}/hplip/align.py*
 %{_datadir}/hplip/clean.py*
 %{_datadir}/hplip/colorcal.py*
+%{_datadir}/hplip/devicesetup.py*
 %{_datadir}/hplip/fab.py*
 %{_datadir}/hplip/fax
+%{_datadir}/hplip/faxsetup.py*
 %{_datadir}/hplip/firmware.py*
+%{_datadir}/hplip/hpdio.py*
 %{_datadir}/hplip/hpssd*
 %{_datadir}/hplip/info.py*
 %{_datadir}/hplip/__init__.py*
 %{_datadir}/hplip/levels.py*
+%{_datadir}/hplip/linefeedcal.py*
 %{_datadir}/hplip/makecopies.py*
 %{_datadir}/hplip/makeuri.py*
 %{_datadir}/hplip/plugin.py*
+%{_datadir}/hplip/pqdiag.py*
+%{_datadir}/hplip/printsettings.py*
 %{_datadir}/hplip/probe.py*
 %{_datadir}/hplip/scan.py*
 %{_datadir}/hplip/sendfax.py*
@@ -301,6 +313,9 @@ fi
 exit 0
 
 %changelog
+* Tue Dec 23 2008 Tim Waugh <twaugh@redhat.com> 2.8.12-1
+- 2.8.12.
+
 * Thu Dec 11 2008 Tim Waugh <twaugh@redhat.com> 2.8.10-2
 - Rediff libsane patch.