This commit is contained in:
parent
2f5c179867
commit
815100ef24
@ -1,59 +0,0 @@
|
||||
Index: systray.py
|
||||
===================================================================
|
||||
--- systray.py (revision 7332)
|
||||
+++ systray.py (working copy)
|
||||
@@ -32,13 +32,15 @@
|
||||
# Local
|
||||
from base.g import *
|
||||
from base import utils
|
||||
+from prnt import cups
|
||||
|
||||
|
||||
USAGE = [(__doc__, "", "name", True),
|
||||
("Usage: hp-systray [OPTIONS]", "", "summary", True),
|
||||
utils.USAGE_OPTIONS,
|
||||
("Force Qt3:", "--qt3 (default)", "option", False),
|
||||
- ("Force Qt4:", "--qt4", "option", False),
|
||||
+ ("Force Qt4:", "--qt4", "option", False),
|
||||
+ ("Startup even if no hplip CUPS queues are present:", "-x or --force-startup", "option", False),
|
||||
utils.USAGE_LOGGING1, utils.USAGE_LOGGING2, utils.USAGE_LOGGING3,
|
||||
utils.USAGE_HELP,
|
||||
]
|
||||
@@ -59,11 +61,12 @@
|
||||
prop.prog = sys.argv[0]
|
||||
force_qt3 = False
|
||||
force_qt4 = False
|
||||
+ force_startup = False
|
||||
|
||||
try:
|
||||
- opts, args = getopt.getopt(sys.argv[1:], 'l:hg',
|
||||
+ opts, args = getopt.getopt(sys.argv[1:], 'l:hgx',
|
||||
['level=', 'help', 'help-man', 'help-rest', 'help-desc',
|
||||
- 'qt3', 'qt4'])
|
||||
+ 'qt3', 'qt4', 'force-startup'])
|
||||
|
||||
except getopt.GetoptError, e:
|
||||
log.error(e.msg)
|
||||
@@ -101,6 +104,9 @@
|
||||
elif o == '--qt4':
|
||||
force_qt4 = True
|
||||
force_qt3 = False
|
||||
+
|
||||
+ elif o in ('-x', '--force-startup'):
|
||||
+ force_startup = True
|
||||
|
||||
|
||||
utils.log_title(__title__, __version__)
|
||||
@@ -109,6 +115,12 @@
|
||||
log.error("hp-systray cannot be run as root. Exiting.")
|
||||
sys.exit(1)
|
||||
|
||||
+ if not force_startup:
|
||||
+ # Check for any hp: or hpfax: queues. If none, exit
|
||||
+ if not utils.any([p.device_uri for p in cups.getPrinters()], lambda x : x.startswith('hp')):
|
||||
+ log.warn("No hp: or hpfax: devices found in any installed CUPS queue. Exiting.")
|
||||
+ sys.exit(1)
|
||||
+
|
||||
ok, lock_file = utils.lock_app('hp-systray')
|
||||
if not ok:
|
||||
sys.exit(1)
|
@ -1,10 +1,10 @@
|
||||
--- data/rules/55-hpmud.rules.orig 2007-10-18 00:50:47.000000000 +0200
|
||||
+++ data/rules/55-hpmud.rules 2007-10-23 14:12:36.000000000 +0200
|
||||
@@ -1,21 +1,21 @@
|
||||
# Udev rules file for HP printer products.
|
||||
--- data/rules/55-hpmud.rules.orig 2008-09-09 13:42:51.000000000 +0200
|
||||
+++ data/rules/55-hpmud.rules 2008-09-09 13:45:05.000000000 +0200
|
||||
@@ -1,22 +1,22 @@
|
||||
# HPLIP udev rules file for HP printer and all-in-one products.
|
||||
|
||||
ACTION!="add", GOTO="hpmud_rules_end"
|
||||
-SUBSYSTEM=="ppdev", OWNER="lp", GROUP="lp", MODE="0666"
|
||||
-SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0666"
|
||||
+SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0664"
|
||||
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="pid_test"
|
||||
SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
|
||||
@ -12,19 +12,20 @@
|
||||
LABEL="pid_test"
|
||||
|
||||
# Check for AiO products (0x03f0xx11).
|
||||
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="0666"
|
||||
+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="0664"
|
||||
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="0666", ENV{sane_hpaio}="yes"
|
||||
+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes"
|
||||
# Check for Photosmart products (0x03f0xx02).
|
||||
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??02", OWNER="root", GROUP="lp", MODE="0666"
|
||||
+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??02", OWNER="root", GROUP="lp", MODE="0664"
|
||||
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??02", OWNER="root", GROUP="lp", MODE="0666", ENV{sane_hpaio}="yes"
|
||||
+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??02", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes"
|
||||
# Check for Business Inkjet products (0x03f0xx12).
|
||||
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="0666"
|
||||
+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="0664"
|
||||
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="0666", ENV{sane_hpaio}="yes"
|
||||
+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes"
|
||||
# Check for Deskjet products (0x03f0xx04).
|
||||
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="0666"
|
||||
+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="0664"
|
||||
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="0666", ENV{sane_hpaio}="yes"
|
||||
+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes"
|
||||
# Check for LaserJet products (0x03f0xx17).
|
||||
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="0666"
|
||||
+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="0664"
|
||||
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="0666", ENV{sane_hpaio}="yes"
|
||||
+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes"
|
||||
|
||||
LABEL="hpmud_rules_end"
|
||||
# If sane-bankends is installed add hpaio backend support to dll.conf if needed.
|
||||
ENV{sane_hpaio}=="yes", RUN+="/bin/sh -c 'grep -q ^#hpaio /etc/sane.d/dll.conf;if [ $$? -eq 0 ];then sed -i -e s/^#hpaio/hpaio/ /etc/sane.d/dll.conf;else grep -q ^hpaio /etc/sane.d/dll.conf;if [ $$? -ne 0 ];then echo hpaio >>/etc/sane.d/dll.conf;fi;fi'"
|
||||
|
11
force-qt4-for-hp-systray-desktop.diff
Normal file
11
force-qt4-for-hp-systray-desktop.diff
Normal file
@ -0,0 +1,11 @@
|
||||
--- hplip-systray.desktop.in.orig 2008-07-30 18:42:09.000000000 +0200
|
||||
+++ hplip-systray.desktop.in 2008-09-11 08:20:10.000000000 +0200
|
||||
@@ -4,7 +4,7 @@ Type=Application
|
||||
Name=HP System Tray Service
|
||||
GenericName=Printer Status Applet
|
||||
Comment=HP System Tray Service
|
||||
-Exec=hp-systray
|
||||
+Exec=hp-systray --qt4
|
||||
Icon=@abs_datadir@/hplip/data/images/48x48/prog.png
|
||||
Terminal=false
|
||||
Categories=Application;Utility;
|
@ -1,112 +0,0 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 3 16:27:33 CEST 2008 - jsmeix@suse.de
|
||||
|
||||
- Updated to version 2.8.4:
|
||||
One more supported LaserJet ZJStream printers (M1120),
|
||||
one OfficeJet (J6400), and two Photosmart (C4340, B8800)
|
||||
where the latter has a new printer device class (PSB9100).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 21 14:57:24 CET 2008 - jsmeix@suse.de
|
||||
|
||||
- Updated to version 2.8.2:
|
||||
Updated the krgb patch for gpl ghostscript 8.61.
|
||||
Changed margins to 0.125 inch from 0.
|
||||
Several more supported printers (some more ZJStream printers).
|
||||
- Updated to version 2.7.12:
|
||||
Several more supported LaserJet printers, one ZJStream printer,
|
||||
one LJm1005 printer with binary-only plugin (LaserJet M1005 MFP).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 23 14:45:08 CEST 2007 - jsmeix@suse.de
|
||||
|
||||
- Updated to version 2.7.10:
|
||||
New LJZjsMono printer device class for ZJStream printers.
|
||||
ZJStream printers require JBIG which has issues
|
||||
(see Novell/Suse Bugzilla bnc#263181). Therefore the support
|
||||
for ZJStream printers is provided only via a binary-only plugin
|
||||
which is downloaded by "hp-setup" from the HP web-site only after
|
||||
the user has accepted the license terms. The "hp-setup" utility
|
||||
is provided by the "hplip" main package.
|
||||
Several bug fixes (no Suse bugs).
|
||||
Two more supported Photosmart and Officejet printers.
|
||||
- Updated to version 2.7.9:
|
||||
Many bug fixes (no Suse bugs).
|
||||
Some more supported Photosmart and Officejet printers.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 2 12:07:27 CEST 2007 - jsmeix@suse.de
|
||||
|
||||
- Updated to version 2.7.7:
|
||||
Some more supported Photosmart printers.
|
||||
- fix-printing-white-spaces-and-empty-lines.diff is no longer
|
||||
needed because the bug is now fixed in the source.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 6 10:27:35 CEST 2007 - jsmeix@suse.de
|
||||
|
||||
- fix-printing-white-spaces-and-empty-lines.diff fixes printing
|
||||
white spaces and empty lines according to a mail from HP
|
||||
on the hplip-help@lists.sourceforge.net list.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 3 12:11:34 CEST 2007 - jsmeix@suse.de
|
||||
|
||||
- Updated to version 2.7.6:
|
||||
Some more supported Photosmart, Color LaserJet, and DeskJet
|
||||
printers.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 27 14:30:51 CEST 2007 - jsmeix@suse.de
|
||||
|
||||
- Updated to version 1.7.4a:
|
||||
Resolved a build issue that caused a couple missing files
|
||||
in the 1.7.4 release (no Suse bug).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 23 14:02:00 CEST 2007 - jsmeix@suse.de
|
||||
|
||||
- Updated to version 1.7.4:
|
||||
Many bug fixes (no Suse bugs).
|
||||
Some more supported DeskJet printers.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 26 09:00:01 CEST 2007 - jsmeix@suse.de
|
||||
|
||||
- Updated to version 1.7.3:
|
||||
Many bug fixes (no Suse bugs).
|
||||
No new supported models but enhancements for some models.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 1 13:35:18 CET 2007 - jsmeix@suse.de
|
||||
|
||||
- Updated to version 1.7.2:
|
||||
Several more supported Officejet Pro devices.
|
||||
New OJProKx50 device class (derived from DJGenericVIP).
|
||||
Many bug fixes (no Suse bugs).
|
||||
fix-buffer-overflow.patch and hplip-1.7.1-1.patch are no longer
|
||||
needed because the bugs are now fixed in the sources.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 16 13:02:45 CET 2007 - jsmeix@suse.de
|
||||
|
||||
- Re-enabled "Supplements: ghostscript_any" because
|
||||
bnc#243595 is fixed now.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 12 10:10:15 CET 2007 - aj@suse.de
|
||||
|
||||
- Do not add supplements to temporary workaround bnc#243595.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 5 14:25:21 CET 2007 - jsmeix@suse.de
|
||||
|
||||
- fix-buffer-overflow.patch fixes a too small string buffer
|
||||
which overflows in line 310 in ljcolor.cpp.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 1 15:08:48 CET 2007 - jsmeix@suse.de
|
||||
|
||||
- Created new package hpijs-standalone and hpijs-standalone.spec
|
||||
for a special version of /usr/bin/hpijs which neither needs
|
||||
a HPLIP library nor a CUPS library to run it.
|
@ -1,195 +0,0 @@
|
||||
#
|
||||
# spec file for package hpijs-standalone (Version 2.8.4)
|
||||
#
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
|
||||
Name: hpijs-standalone
|
||||
BuildRequires: gcc-c++ libjpeg-devel pkgconfig
|
||||
Summary: HPIJS stand-alone
|
||||
# HPLIP has reached 1.0 status. With this release a date encoded revision number is used:
|
||||
# x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June)
|
||||
# Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc
|
||||
Version: 2.8.4
|
||||
Release: 30
|
||||
Group: Hardware/Printing
|
||||
License: BSD 3-Clause
|
||||
Url: http://hpinkjet.sourceforge.net/
|
||||
# Source0...Source9 is for sources from HP:
|
||||
# URL for Source0: http://puzzle.dl.sourceforge.net/sourceforge/hplip/hplip-2.8.4.tar.gz
|
||||
Source0: hplip-%{version}.tar.bz2
|
||||
# Patch10...Patch99 is for Suse patches for the sources from HP:
|
||||
# The patch numbers are the same as in hplip.spec.
|
||||
# Source100... is for special Suse sources:
|
||||
# The source numbers are the same as in hplip.spec.
|
||||
# Source102 is a small man page for /usr/bin/hpijs:
|
||||
Source102: hpijs.1.gz
|
||||
# Install into this non-root directory (required when norootforbuild is used):
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
# Mutual RPM package requirements are meanwhile considered to be bad because
|
||||
# such cyclic dependencies which makes it harder to automatically solve dependencies.
|
||||
# Actually the hpijs driver requires Ghostscript (i.e ghostscript_any, e.g. ghostscript-library).
|
||||
# But ghostscript-library must also require the hpijs driver which is the more imortant requirement
|
||||
# because when a user (or a printer setup tool) wants to set up a HP printer with the hpijs driver
|
||||
# it must be 100% sure that all what the hpijs driver needs to run is also installed.
|
||||
# Therefore the requirement is weakened for this package:
|
||||
Supplements: ghostscript_any
|
||||
# hplip-hpijs, hplip17-hpijs, and hplip-hpijs-standalone contain /usr/bin/hpijs:
|
||||
Conflicts: hplip-hpijs hplip17-hpijs
|
||||
# Skip testing devel dependencies required by libtool .la files by the following comment:
|
||||
# skip-check-libtool-deps
|
||||
|
||||
%description
|
||||
HPIJS is a Ghostscript printer driver for HP printers.
|
||||
|
||||
This package includes a special version of the hpijs binary which
|
||||
neither needs a HPLIP library nor a CUPS library to run it.
|
||||
|
||||
Therefore it conflicts with the hpijs binary in the hplip-hpijs
|
||||
package. For special cases (e.g. for LPRng/lpdfilter, for a minimal
|
||||
printing system or for printing without any printing system) it is
|
||||
possible to use only this hpijs binary and Ghostscript.
|
||||
|
||||
For full documentation and license see the package hplip.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
David Suffield <david.suffield@hp.com>
|
||||
Yie Shiyun <shiyun.yie@hp.com>
|
||||
Donald J. Welch <donald.welch@hp.com>
|
||||
Cauligi Raghothama S. <raghothama.cauligi@hp.com>
|
||||
|
||||
%prep
|
||||
# Be quiet when unpacking:
|
||||
%setup -q -n hplip-%{version}
|
||||
|
||||
%build
|
||||
# If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake)
|
||||
# complains about missing files like NEWS, README, AUTHORS, ChangeLog
|
||||
# in each directory where a Makefile.am exists:
|
||||
AUTOMAKE='automake --foreign' autoreconf --force --install
|
||||
# Set our preferred architecture-specific flags for the compiler and linker:
|
||||
export CFLAGS="$RPM_OPT_FLAGS"
|
||||
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
# We build a special hpijs which does not require the CUPS library.
|
||||
./configure --prefix=/usr \
|
||||
--libdir=%_libdir \
|
||||
--disable-foomatic-xml-install \
|
||||
--disable-foomatic-ppd-install \
|
||||
--disable-foomatic-drv-install \
|
||||
--disable-foomatic-rip-hplip-install \
|
||||
--disable-doc-build \
|
||||
--enable-hpijs-only-build
|
||||
make
|
||||
|
||||
%install
|
||||
make install DESTDIR=%{buildroot}
|
||||
# Remove installed license files (COPYING and prnt/hpijs/README_LIBJPG)
|
||||
# which are packaged directly as documentation via the files section:
|
||||
rm -r %{buildroot}/usr/share/doc/hplip*
|
||||
# Install the man page for /usr/bin/hpijs:
|
||||
install -d %{buildroot}%{_mandir}/man1
|
||||
install -m 644 %{SOURCE102} %{buildroot}%{_mandir}/man1/
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
exit 0
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
exit 0
|
||||
|
||||
%files
|
||||
%defattr(-, root, root)
|
||||
%doc COPYING prnt/hpijs/README_LIBJPG doc/license.html doc/legal.html doc/tech_docs/hpijs.html doc/tech_docs/device_classes.html doc/tech_docs/page_sizes.html doc/tech_docs/printable_areas.html
|
||||
%doc %{_mandir}/man1/hpijs.1.gz
|
||||
%{_bindir}/hpijs
|
||||
|
||||
%changelog
|
||||
* Thu Apr 03 2008 jsmeix@suse.de
|
||||
- Updated to version 2.8.4:
|
||||
One more supported LaserJet ZJStream printers (M1120),
|
||||
one OfficeJet (J6400), and two Photosmart (C4340, B8800)
|
||||
where the latter has a new printer device class (PSB9100).
|
||||
* Thu Feb 21 2008 jsmeix@suse.de
|
||||
- Updated to version 2.8.2:
|
||||
Updated the krgb patch for gpl ghostscript 8.61.
|
||||
Changed margins to 0.125 inch from 0.
|
||||
Several more supported printers (some more ZJStream printers).
|
||||
- Updated to version 2.7.12:
|
||||
Several more supported LaserJet printers, one ZJStream printer,
|
||||
one LJm1005 printer with binary-only plugin (LaserJet M1005 MFP).
|
||||
* Tue Oct 23 2007 jsmeix@suse.de
|
||||
- Updated to version 2.7.10:
|
||||
New LJZjsMono printer device class for ZJStream printers.
|
||||
ZJStream printers require JBIG which has issues
|
||||
(see Novell/Suse Bugzilla bnc#263181). Therefore the support
|
||||
for ZJStream printers is provided only via a binary-only plugin
|
||||
which is downloaded by "hp-setup" from the HP web-site only after
|
||||
the user has accepted the license terms. The "hp-setup" utility
|
||||
is provided by the "hplip" main package.
|
||||
Several bug fixes (no Suse bugs).
|
||||
Two more supported Photosmart and Officejet printers.
|
||||
- Updated to version 2.7.9:
|
||||
Many bug fixes (no Suse bugs).
|
||||
Some more supported Photosmart and Officejet printers.
|
||||
* Thu Aug 02 2007 jsmeix@suse.de
|
||||
- Updated to version 2.7.7:
|
||||
Some more supported Photosmart printers.
|
||||
- fix-printing-white-spaces-and-empty-lines.diff is no longer
|
||||
needed because the bug is now fixed in the source.
|
||||
* Fri Jul 06 2007 jsmeix@suse.de
|
||||
- fix-printing-white-spaces-and-empty-lines.diff fixes printing
|
||||
white spaces and empty lines according to a mail from HP
|
||||
on the hplip-help@lists.sourceforge.net list.
|
||||
* Tue Jul 03 2007 jsmeix@suse.de
|
||||
- Updated to version 2.7.6:
|
||||
Some more supported Photosmart, Color LaserJet, and DeskJet
|
||||
printers.
|
||||
* Fri Apr 27 2007 jsmeix@suse.de
|
||||
- Updated to version 1.7.4a:
|
||||
Resolved a build issue that caused a couple missing files
|
||||
in the 1.7.4 release (no Suse bug).
|
||||
* Mon Apr 23 2007 jsmeix@suse.de
|
||||
- Updated to version 1.7.4:
|
||||
Many bug fixes (no Suse bugs).
|
||||
Some more supported DeskJet printers.
|
||||
* Mon Mar 26 2007 jsmeix@suse.de
|
||||
- Updated to version 1.7.3:
|
||||
Many bug fixes (no Suse bugs).
|
||||
No new supported models but enhancements for some models.
|
||||
* Thu Mar 01 2007 jsmeix@suse.de
|
||||
- Updated to version 1.7.2:
|
||||
Several more supported Officejet Pro devices.
|
||||
New OJProKx50 device class (derived from DJGenericVIP).
|
||||
Many bug fixes (no Suse bugs).
|
||||
fix-buffer-overflow.patch and hplip-1.7.1-1.patch are no longer
|
||||
needed because the bugs are now fixed in the sources.
|
||||
* Fri Feb 16 2007 jsmeix@suse.de
|
||||
- Re-enabled "Supplements: ghostscript_any" because
|
||||
bnc#243595 is fixed now.
|
||||
* Mon Feb 12 2007 aj@suse.de
|
||||
- Do not add supplements to temporary workaround bnc#243595.
|
||||
* Mon Feb 05 2007 jsmeix@suse.de
|
||||
- fix-buffer-overflow.patch fixes a too small string buffer
|
||||
which overflows in line 310 in ljcolor.cpp.
|
||||
* Thu Feb 01 2007 jsmeix@suse.de
|
||||
- Created new package hpijs-standalone and hpijs-standalone.spec
|
||||
for a special version of /usr/bin/hpijs which neither needs
|
||||
a HPLIP library nor a CUPS library to run it.
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cfa5447bc5bd95f0673a7d4c49230a8578d31e44e536813f8c83d65ef810e4e8
|
||||
size 13122844
|
3
hplip-2.8.7.tar.bz2
Normal file
3
hplip-2.8.7.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:99a9a1fa173ef4b69814a8f53a461e75ce5f0246a37182729c96745036f28861
|
||||
size 9483985
|
@ -1,3 +1,90 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 11 08:28:02 CEST 2008 - jsmeix@suse.de
|
||||
|
||||
- force-qt4-for-hp-systray-desktop.diff forces Gnome and KDE
|
||||
to execute hp-systray as "hp-systray --qt4" via
|
||||
/etc/xdg/autostart/hplip-systray.desktop so that
|
||||
hp-systray docks to the notification tray of the desktops.
|
||||
Because of this the python-qt4 RPM is now required
|
||||
(see Novell/Suse Bugzilla bnc#377575).
|
||||
This additional requirement should be no problem because
|
||||
in an upcoming release HPLIP is converted over to Qt4, see
|
||||
https://bugs.launchpad.net/hplip/+bug/231978/comments/7
|
||||
and then the "Recommends: python-qt" can be dropped
|
||||
(see the entry below) but currently only hp-systray
|
||||
can be used with Qt4.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 10 12:06:32 CEST 2008 - jsmeix@suse.de
|
||||
|
||||
- Do no longer have a hard RPM requirement for python-qt
|
||||
(now there is only "Recommends: python-qt") to be able
|
||||
to provide hplip even on a distribution without python-qt.
|
||||
Without python-qt all GUI stuff would fail but
|
||||
several /usr/bin/hp-* tools have a command line
|
||||
option to run in non-graphical mode so that the basic driver
|
||||
functionality still works even without python-qt.
|
||||
- Have versioned "Obsoletes" for hpijs-standalone to meet our
|
||||
policies even if the real intention is that any installed
|
||||
version of hpijs-standalone is replaced and explain the
|
||||
unversioned "Obsoletes" for hplip17 and hplip17-hpijs
|
||||
(see Novell/Suse Bugzilla bnc#251830).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 9 14:33:28 CEST 2008 - jsmeix@suse.de
|
||||
|
||||
- The configure option disable-foomatic-xml-install
|
||||
does no longer exist.
|
||||
- Updated to version 2.8.7:
|
||||
Some bug fixes (no Suse bugs).
|
||||
Some more supported printers.
|
||||
For details see release_notes.html
|
||||
- Updated to version 2.8.6b:
|
||||
Replaced the doc directory with an abbreviated web document
|
||||
(there is no longer hpijs.html and device_classes.html).
|
||||
Redesigned the proprietary plugin support. There is now only
|
||||
one plugin that is valid for each HPLIP release, see
|
||||
https://answers.launchpad.net/hplip/+question/30595
|
||||
Changed the hpijs.drv to support multiple products via
|
||||
multiple "Product" entries in the PPD but see
|
||||
https://bugs.launchpad.net/hplip/+bug/235148
|
||||
Several bug fixes (no Suse bugs).
|
||||
Many more supported printers.
|
||||
For details see release_notes.html
|
||||
- Updated to version 2.8.5:
|
||||
Major toolbox (HP Device Manager) revamp/refresh.
|
||||
More dbus support (live status updating).
|
||||
hp-systray will exit if no HPLIP installed queues found which
|
||||
obsoletes HPLIP-2.8.4-systray_exit_if_no_device_2.patch
|
||||
Many bug fixes (no Suse bugs).
|
||||
Several more supported printers.
|
||||
For details see release_notes.html
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 5 10:10:27 CEST 2008 - jsmeix@suse.de
|
||||
|
||||
- Keep all PPDs even if cupstestppd FAILs.
|
||||
With each CUPS version upgrade cupstestppd finds more
|
||||
and more errors so that more and more PPDs would be
|
||||
no longer included in the RPM which have been included
|
||||
before which results a regression.
|
||||
As far as we know there have been no problems at all because of
|
||||
not strictly compliant PPDs in HPLIP so that it is much better
|
||||
to provide all PPDs so that the matching printers can be used
|
||||
than to be rigorous regarding compliance to the PPD spec.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 4 13:03:51 CEST 2008 - jsmeix@suse.de
|
||||
|
||||
- Changed the "Conflicts: hpijs-standalone" in hplip-hpijs
|
||||
to "Obsoletes: hpijs-standalone" regardless of any version.
|
||||
hplip-hpijs and hpijs-standalone both contain /usr/bin/hpijs
|
||||
so that both packages have a RPM conflict.
|
||||
But when the minimalist hpijs-standalone is to be replaced
|
||||
by the full-featured hplip, hplip requires hplip-hpijs
|
||||
and this should silently supersede hpijs-standalone
|
||||
regardless of any version (see Novell/Suse Bugzilla bnc#388149).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 14 19:05:17 CEST 2008 - jsmeix@suse.de
|
||||
|
||||
|
147
hplip.spec
147
hplip.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package hplip (Version 2.8.4)
|
||||
# spec file for package hplip (Version 2.8.7)
|
||||
#
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -24,19 +24,15 @@ Summary: HP's Printing, Scanning, and Faxing Software
|
||||
# HPLIP has reached 1.0 status. With this release a date encoded revision number is used:
|
||||
# x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June)
|
||||
# Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc
|
||||
Version: 2.8.4
|
||||
Release: 56
|
||||
Version: 2.8.7
|
||||
Release: 1
|
||||
Group: Hardware/Printing
|
||||
License: BSD 3-Clause; GPL v2 or later; X11/MIT
|
||||
Url: http://hpinkjet.sourceforge.net/
|
||||
# Source0...Source9 is for sources from HP:
|
||||
# URL for Source0: http://puzzle.dl.sourceforge.net/sourceforge/hplip/hplip-2.8.4.tar.gz
|
||||
# URL for Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/hplip-2.8.7.tar.gz
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
# Patch0...Patch9 is for patches from HP:
|
||||
# Patch0 lets hp-systray exit if the HPLIP driver seems to be not in use,
|
||||
# i.e. if there is neither a 'hp:/...' nor a 'hpfax:/...' print queue,
|
||||
# see https://bugs.launchpad.net/hplip/+bug/213938
|
||||
Patch0: HPLIP-2.8.4-systray_exit_if_no_device_2.patch
|
||||
# Patch10...Patch99 is for Suse patches for the sources from HP:
|
||||
# Fix "... is used uninitialized ..." warnings:
|
||||
Patch10: fix-uninitialized-variables.diff
|
||||
@ -61,6 +57,10 @@ Source104: create_hal_global_fdi_from_hpmud_rules
|
||||
# that the permissions can be changed e.g. by any CUPS filter script
|
||||
# or CUPS backend (both run as user "lp"):
|
||||
Patch101: change-udev-rules.diff
|
||||
# Patch102 forces the desktop systems to execute hp-systray as "hp-systray --qt4"
|
||||
# via /etc/xdg/autostart/hplip-systray.desktop so that hp-systray
|
||||
# docks to the notification tray of the Gnome and KDE desktops.
|
||||
Patch102: force-qt4-for-hp-systray-desktop.diff
|
||||
# Install into this non-root directory (required when norootforbuild is used):
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
PreReq: coreutils, /bin/grep, /bin/sed, /usr/bin/find
|
||||
@ -71,14 +71,29 @@ PreReq: coreutils, /bin/grep, /bin/sed, /usr/bin/find
|
||||
# also for any other backend when the hpaio backend is enabled (e.g. "scanimage -L"):
|
||||
Requires: %{name}-hpijs = %{version}-%{release}
|
||||
# Require special Python stuff (which pulls in Python base stuff):
|
||||
Requires: python-xml, python-qt, pyxml
|
||||
Requires: python-xml, pyxml
|
||||
# Do no longer have a hard RPM requirement for python-qt
|
||||
# to be able to provide hplip even on a distribution without python-qt.
|
||||
# Without python-qt all GUI stuff would fail but several /usr/bin/hp-*
|
||||
# tools have a command line option to run in non-graphical mode
|
||||
# so that the basic driver functionality still works even without python-qt:
|
||||
Recommends: python-qt
|
||||
# Because of Patch102 (force-qt4-for-hp-systray-desktop.diff)
|
||||
# the python-qt4 RPM is required but this should be no problem because
|
||||
# in an upcoming release HPLIP will be converted over to Qt4, see
|
||||
# https://bugs.launchpad.net/hplip/+bug/231978/comments/7
|
||||
# and then the above "Recommends: python-qt" can be dropped
|
||||
# but currently only hp-systray can be used with Qt4:
|
||||
Requires: python-qt4
|
||||
# Since version 2.8.4 all interprocess communication uses dbus.
|
||||
# Therefore python-dbus version 0.80 or greater is required (which pulls in dbus base stuff).
|
||||
# The dbus stuff in HPLIP requires the Python module gobject
|
||||
# but there is no automated RPM requirement for python-gobject2,
|
||||
# see https://answers.launchpad.net/hplip/+question/30741
|
||||
Requires: dbus-1-python >= 0.80, python-gobject2
|
||||
# Either the hplip17 packages or the hplip packages can be installed:
|
||||
# Either the hplip17 packages or the hplip packages can be installed,
|
||||
# see https://bugzilla.novell.com/show_bug.cgi?id=251830#c20
|
||||
# for the full story why there is this unversioned Obsoletes:
|
||||
Obsoletes: hplip17
|
||||
# Skip testing devel dependencies required by libtool .la files by the following comment:
|
||||
# skip-check-libtool-deps
|
||||
@ -166,9 +181,16 @@ Group: Hardware/Printing
|
||||
# it must be 100% sure that all what the hpijs driver needs to run is also installed.
|
||||
# Therefore the requirement is weakened for this package:
|
||||
Supplements: ghostscript_any
|
||||
# hplip-hpijs and hpijs-standalone both contain /usr/bin/hpijs:
|
||||
Conflicts: hpijs-standalone
|
||||
# Either the hplip17 packages or the hplip packages can be installed:
|
||||
# hplip-hpijs and hpijs-standalone both contain /usr/bin/hpijs
|
||||
# so that both packages have a RPM conflict.
|
||||
# But when the minimalist hpijs-standalone is to be replaced
|
||||
# by the full-featured hplip, hplip requires hplip-hpijs
|
||||
# and this should silently supersede hpijs-standalone:
|
||||
Obsoletes: hpijs-standalone <= %{version}
|
||||
Provides: hpijs-standalone = %{version}
|
||||
# Either the hplip17 packages or the hplip packages can be installed,
|
||||
# see https://bugzilla.novell.com/show_bug.cgi?id=251830#c20
|
||||
# for the full story why there is this unversioned Obsoletes:
|
||||
Obsoletes: hplip17-hpijs
|
||||
|
||||
%description hpijs
|
||||
@ -198,13 +220,12 @@ Authors:
|
||||
%prep
|
||||
# Be quiet when unpacking:
|
||||
%setup -q
|
||||
# Patch0 lets hp-systray exit if the HPLIP driver seems to be not in use:
|
||||
%patch0
|
||||
# Fix "... is used uninitialized ..." warnings:
|
||||
%patch10
|
||||
# Patch101 changes in the udev rules file the mode from "0666" to "0664"
|
||||
# and for parallel port devices the owner from "lp" to "root":
|
||||
# Patch101 changes in the udev rules file the mode from "0666" to "0664":
|
||||
%patch101
|
||||
# Patch102 forces the desktop systems to execute hp-systray as "hp-systray --qt4":
|
||||
%patch102
|
||||
|
||||
%build
|
||||
# If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake)
|
||||
@ -225,13 +246,14 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
--enable-scan-build \
|
||||
--enable-gui-build \
|
||||
--enable-fax-build \
|
||||
--disable-foomatic-xml-install \
|
||||
--enable-dbus-build \
|
||||
--enable-foomatic-rip-hplip-install \
|
||||
--disable-foomatic-drv-install \
|
||||
--enable-foomatic-ppd-install \
|
||||
--with-hpppddir=%{_datadir}/cups/model/manufacturer-PPDs/%{name} \
|
||||
--with-cupsbackenddir=%{_libdir}/cups/backend \
|
||||
--with-cupsfilterdir=%{_libdir}/cups/filter \
|
||||
--with-drvdir=%{_libdir}/cups/driver \
|
||||
--with-docdir=%{_defaultdocdir}/%{name}
|
||||
make
|
||||
|
||||
@ -287,9 +309,18 @@ done
|
||||
# no longer result zero exit code.
|
||||
# In the long run the PPDs should be fixed but as far as we know there have been
|
||||
# no problems because of such UIConstraints errors so that it should be o.k.
|
||||
# let those PPDs pass even if they are not strictly compliant:
|
||||
# let those PPDs pass even if they are not strictly compliant.
|
||||
# Keep all PPDs even if cupstestppd FAILs.
|
||||
# Reason:
|
||||
# With each CUPS version upgrade cupstestppd finds more and more errors
|
||||
# so that more and more PPDs would be no longer included in the RPM
|
||||
# which have been included before which results a regression.
|
||||
# As far as we know there have been no problems at all because of
|
||||
# not strictly compliant PPDs in HPLIP so that it is much better
|
||||
# to provide all HPLIP PPDs so that the matching printers can be used
|
||||
# than to be rigorous regarding enforcing compliance to the PPD specification:
|
||||
for p in *.ppd
|
||||
do egrep -v '^\*UIConstraints:|^\*NonUIConstraints:' $p | cupstestppd - || { rm -v $p ; continue ; }
|
||||
do egrep -v '^\*UIConstraints:|^\*NonUIConstraints:' $p | cupstestppd - || true
|
||||
gzip $p
|
||||
done
|
||||
popd
|
||||
@ -396,6 +427,8 @@ exit 0
|
||||
%{_bindir}/hp-levels
|
||||
%{_bindir}/hp-makecopies
|
||||
%{_bindir}/hp-makeuri
|
||||
%{_bindir}/hp-mkuri
|
||||
%{_bindir}/hp-plugin
|
||||
%{_bindir}/hp-print
|
||||
%{_bindir}/hp-probe
|
||||
%{_bindir}/hp-scan
|
||||
@ -418,6 +451,7 @@ exit 0
|
||||
%{_libdir}/cups/backend/hpfax
|
||||
%dir %{_libdir}/cups/filter
|
||||
%{_libdir}/cups/filter/foomatic-rip-hplip
|
||||
%{_libdir}/cups/filter/hplipjs
|
||||
%dir %{_datadir}/cups
|
||||
%dir %{_datadir}/cups/model
|
||||
%dir %{_datadir}/cups/model/manufacturer-PPDs
|
||||
@ -429,13 +463,84 @@ exit 0
|
||||
|
||||
%files hpijs
|
||||
%defattr(-, root, root)
|
||||
%doc doc/tech_docs/hpijs.html doc/tech_docs/device_classes.html
|
||||
%doc %{_mandir}/man1/hpijs.1.gz
|
||||
%{_bindir}/hpijs
|
||||
%{_libdir}/libhpip.*
|
||||
%{_libdir}/libhpmud.*
|
||||
|
||||
%changelog
|
||||
* Thu Sep 11 2008 jsmeix@suse.de
|
||||
- force-qt4-for-hp-systray-desktop.diff forces Gnome and KDE
|
||||
to execute hp-systray as "hp-systray --qt4" via
|
||||
/etc/xdg/autostart/hplip-systray.desktop so that
|
||||
hp-systray docks to the notification tray of the desktops.
|
||||
Because of this the python-qt4 RPM is now required
|
||||
(see Novell/Suse Bugzilla bnc#377575).
|
||||
This additional requirement should be no problem because
|
||||
in an upcoming release HPLIP is converted over to Qt4, see
|
||||
https://bugs.launchpad.net/hplip/+bug/231978/comments/7
|
||||
and then the "Recommends: python-qt" can be dropped
|
||||
(see the entry below) but currently only hp-systray
|
||||
can be used with Qt4.
|
||||
* Wed Sep 10 2008 jsmeix@suse.de
|
||||
- Do no longer have a hard RPM requirement for python-qt
|
||||
(now there is only "Recommends: python-qt") to be able
|
||||
to provide hplip even on a distribution without python-qt.
|
||||
Without python-qt all GUI stuff would fail but
|
||||
several /usr/bin/hp-* tools have a command line
|
||||
option to run in non-graphical mode so that the basic driver
|
||||
functionality still works even without python-qt.
|
||||
- Have versioned "Obsoletes" for hpijs-standalone to meet our
|
||||
policies even if the real intention is that any installed
|
||||
version of hpijs-standalone is replaced and explain the
|
||||
unversioned "Obsoletes" for hplip17 and hplip17-hpijs
|
||||
(see Novell/Suse Bugzilla bnc#251830).
|
||||
* Tue Sep 09 2008 jsmeix@suse.de
|
||||
- The configure option disable-foomatic-xml-install
|
||||
does no longer exist.
|
||||
- Updated to version 2.8.7:
|
||||
Some bug fixes (no Suse bugs).
|
||||
Some more supported printers.
|
||||
For details see release_notes.html
|
||||
- Updated to version 2.8.6b:
|
||||
Replaced the doc directory with an abbreviated web document
|
||||
(there is no longer hpijs.html and device_classes.html).
|
||||
Redesigned the proprietary plugin support. There is now only
|
||||
one plugin that is valid for each HPLIP release, see
|
||||
https://answers.launchpad.net/hplip/+question/30595
|
||||
Changed the hpijs.drv to support multiple products via
|
||||
multiple "Product" entries in the PPD but see
|
||||
https://bugs.launchpad.net/hplip/+bug/235148
|
||||
Several bug fixes (no Suse bugs).
|
||||
Many more supported printers.
|
||||
For details see release_notes.html
|
||||
- Updated to version 2.8.5:
|
||||
Major toolbox (HP Device Manager) revamp/refresh.
|
||||
More dbus support (live status updating).
|
||||
hp-systray will exit if no HPLIP installed queues found which
|
||||
obsoletes HPLIP-2.8.4-systray_exit_if_no_device_2.patch
|
||||
Many bug fixes (no Suse bugs).
|
||||
Several more supported printers.
|
||||
For details see release_notes.html
|
||||
* Fri Sep 05 2008 jsmeix@suse.de
|
||||
- Keep all PPDs even if cupstestppd FAILs.
|
||||
With each CUPS version upgrade cupstestppd finds more
|
||||
and more errors so that more and more PPDs would be
|
||||
no longer included in the RPM which have been included
|
||||
before which results a regression.
|
||||
As far as we know there have been no problems at all because of
|
||||
not strictly compliant PPDs in HPLIP so that it is much better
|
||||
to provide all PPDs so that the matching printers can be used
|
||||
than to be rigorous regarding compliance to the PPD spec.
|
||||
* Thu Sep 04 2008 jsmeix@suse.de
|
||||
- Changed the "Conflicts: hpijs-standalone" in hplip-hpijs
|
||||
to "Obsoletes: hpijs-standalone" regardless of any version.
|
||||
hplip-hpijs and hpijs-standalone both contain /usr/bin/hpijs
|
||||
so that both packages have a RPM conflict.
|
||||
But when the minimalist hpijs-standalone is to be replaced
|
||||
by the full-featured hplip, hplip requires hplip-hpijs
|
||||
and this should silently supersede hpijs-standalone
|
||||
regardless of any version (see Novell/Suse Bugzilla bnc#388149).
|
||||
* Thu Aug 14 2008 jsmeix@suse.de
|
||||
- Removed the hplip init script which is obsolete since
|
||||
version 2.8.4 where hpssd is gone and replaced by
|
||||
|
Loading…
Reference in New Issue
Block a user