rpms/hplip/F-10 .cvsignore, 1.29, 1.30 hplip-no-root-config.patch, 1.6, 1.7 hplip.spec, 1.190, 1.191 sources, 1.29, 1.30
Tim Waugh
twaugh at fedoraproject.org
Tue Dec 23 11:57:58 UTC 2008
Author: twaugh
Update of /cvs/pkgs/rpms/hplip/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16377
Modified Files:
.cvsignore hplip-no-root-config.patch hplip.spec sources
Log Message:
* Tue Dec 23 2008 Tim Waugh <twaugh at redhat.com> 2.8.12-1
- 2.8.12.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-10/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore 11 Dec 2008 18:20:08 -0000 1.29
+++ .cvsignore 23 Dec 2008 11:57:27 -0000 1.30
@@ -26,3 +26,4 @@
hplip-2.8.6b.tar.gz
hplip-2.8.7.tar.gz
hplip-2.8.10.tar.gz
+hplip-2.8.12.tar.gz
hplip-no-root-config.patch:
Index: hplip-no-root-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-10/hplip-no-root-config.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hplip-no-root-config.patch 25 Sep 2007 14:49:26 -0000 1.6
+++ hplip-no-root-config.patch 23 Dec 2008 11:57:27 -0000 1.7
@@ -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 @@
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)
Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-10/hplip.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- hplip.spec 11 Dec 2008 18:20:08 -0000 1.190
+++ hplip.spec 23 Dec 2008 11:57:27 -0000 1.191
@@ -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 @@
%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 @@
%{_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 @@
exit 0
%changelog
+* Tue Dec 23 2008 Tim Waugh <twaugh at redhat.com> 2.8.12-1
+- 2.8.12.
+
* Thu Dec 11 2008 Tim Waugh <twaugh at redhat.com> 2.8.10-2
- Rediff libsane patch.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-10/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources 11 Dec 2008 18:20:08 -0000 1.29
+++ sources 23 Dec 2008 11:57:27 -0000 1.30
@@ -1 +1,2 @@
a9ad78c4f0d884caac6b176b3cb9bf21 hplip-2.8.10.tar.gz
+f6d04d4ed5c41e3e1c84e6a7af6b8db7 hplip-2.8.12.tar.gz
More information about the fedora-extras-commits
mailing list