diff --git a/hplip-no-root-config.patch b/hplip-no-root-config.patch index 45a2282..2c708d8 100644 --- a/hplip-no-root-config.patch +++ b/hplip-no-root-config.patch @@ -1,5 +1,5 @@ ---- hplip-1.7.2/base/g.py.no-root-config 2007-05-30 16:08:04.000000000 +0100 -+++ hplip-1.7.2/base/g.py 2007-05-30 16:16:54.000000000 +0100 +--- hplip-1.7.4a/base/g.py.no-root-config 2007-06-14 15:40:43.000000000 +0100 ++++ hplip-1.7.4a/base/g.py 2007-06-14 15:43:21.000000000 +0100 @@ -88,6 +88,16 @@ dict.__setattr__(self, "config_obj", ConfigParser.ConfigParser()) dict.__setattr__(self, "filename", filename) @@ -17,3 +17,13 @@ try: pathmode = os.stat(filename)[stat.ST_MODE] if pathmode & 0022 != 0: +@@ -129,7 +139,8 @@ + prop.sys_config_file = '/etc/hp/hplip.conf' + prop.user_config_file = os.path.expanduser('~/.hplip.conf') + +-if not os.path.exists(prop.user_config_file): ++if (not prop.user_config_file.startswith ("/root/") and ++ 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)) diff --git a/hplip.spec b/hplip.spec index 9283903..4182f34 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 1.7.4a -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/MIT/BSD Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -289,6 +289,10 @@ fi exit 0 %changelog +* Thu Jun 14 2007 Tim Waugh 1.7.4a-2 +- Don't try to write a /root/.hplip.conf file when running as a CUPS + backend (bug #244205). + * Wed Jun 13 2007 Tim Waugh 1.7.4a-1 - Don't put the version in the desktop file; let desktop-file-install do it. - 1.7.4a. No longer need marker-supply or faxing-with-low-supplies