Accepting request 113411 from home:jsmeix:branches:Printing
version upgrade to hplip-3.12.4 plus fix for bnc#755820 and bnc#735865 OBS-URL: https://build.opensuse.org/request/show/113411 OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=46
This commit is contained in:
Johannes Meixner
Git OBS Bridge
parent
fb4ff4e48d
commit
f61539c24c
@ -1,26 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
# If possible use the KDE program kdialog
|
||||
# otherwise fall back to the generic X program xmessage.
|
||||
# The "..." quotation when calling 'test -x' is crucial
|
||||
# because calling 'test -x' without explicite empty argument
|
||||
# (when 'type -p kdialog' fails) would result true.
|
||||
if test -x "$( type -p kdialog )"
|
||||
then PopupProgram='kdialog --error'
|
||||
else PopupProgram='xmessage'
|
||||
fi
|
||||
|
||||
# If hp-toolbox cannot access a hplip device
|
||||
# then it doesn't show up on the X window system.
|
||||
# It only shows an 'ERROR...' or 'error...' message on stderr
|
||||
# but exits nevertheless with zero exit code.
|
||||
# Note that one cannot grep for '^error' because there are leading
|
||||
# escape codes (e.g. "esc [ 3 1 ; 0 1 m") in the output lines.
|
||||
# The "..." quotation when calling 'test -x' is crucial
|
||||
# because calling 'test -x' without explicite empty argument
|
||||
# (when 'type -p hp-toolbox' fails) would result true.
|
||||
if test -x "$( type -p hp-toolbox )"
|
||||
then hp-toolbox 2>&1 1>/dev/null | grep -q -i 'error' && $PopupProgram 'No HP all-in-one device found (those devices require a special setup).'
|
||||
else $PopupProgram 'Cannot execute hp-toolbox.'
|
||||
fi
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6eaa0cc6f255cc3ebeddb73dee208e6bdc22ba467e3b1da943844ae266d3c314
|
||||
size 20579749
|
||||
3
hplip-3.12.4.tar.gz
Normal file
3
hplip-3.12.4.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:350375c78d79adf635a59a448b27b3fe9ab7ac622637c47125fe5f7d8a537fff
|
||||
size 20603723
|
||||
@ -1,3 +1,26 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 12 15:14:18 CEST 2012 - jsmeix@suse.de
|
||||
|
||||
- Upgraded to version 3.12.4:
|
||||
Uninstall Support: User can uninstall complete HPLIP package
|
||||
by running "hp-uninstall" command.
|
||||
Upgrade Support: Settings can be configured using
|
||||
"hp-systray -> settings -> Update settings" for notification
|
||||
of newer version of HPLIP release. User can also upgrade to
|
||||
latest version by running "hp-upgrade" command.
|
||||
Queue Analyzer: Print/Fax queues can be analyzed by
|
||||
running "hp-diagnose-queues" command or by clicking
|
||||
on "Diagnose Queues" from toolbox.
|
||||
Several more supported printers and all-in-one devices.
|
||||
Several bug fixes.
|
||||
For details see
|
||||
http://hplipopensource.com/hplip-web/release_notes.html
|
||||
- Removed hp-toolbox.wrapper because the reason for it
|
||||
is no longer valid (see SUSE Bugzilla bnc#755820).
|
||||
- Added "BuildRequires: python-cups" to get special
|
||||
RPM Provides tags for the printers supported by
|
||||
this package (see SUSE Bugzilla bnc#735865).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 8 10:22:30 CET 2012 - jsmeix@suse.de
|
||||
|
||||
|
||||
@ -2,5 +2,5 @@
|
||||
Type=Application
|
||||
Name=hp-toolbox
|
||||
GenericName=HP Device Manager
|
||||
Exec=hp-toolbox.wrapper
|
||||
Exec=hp-toolbox
|
||||
Icon=HPmenu
|
||||
|
||||
79
hplip.spec
79
hplip.spec
@ -15,6 +15,7 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: hplip
|
||||
# BuildRequires foomatic-filters to avoid /usr/lib/rpm/brp-symlink ERROR:
|
||||
# link target doesn't exist (neither in build root nor in installed system):
|
||||
@ -33,6 +34,11 @@ BuildRequires: libtool
|
||||
BuildRequires: libusb-devel
|
||||
BuildRequires: net-snmp-devel
|
||||
BuildRequires: pkgconfig
|
||||
# All printer driver packages should have "BuildRequires: python-cups"
|
||||
# because python-cups installs special rpm macros that adds Provides tags
|
||||
# for the printer drivers supported by the package,
|
||||
# see https://bugzilla.novell.com/show_bug.cgi?id=735865
|
||||
BuildRequires: python-cups
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: python-openssl
|
||||
BuildRequires: python-qt4
|
||||
@ -50,17 +56,17 @@ Group: Hardware/Printing
|
||||
# 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: 3.12.2
|
||||
Version: 3.12.4
|
||||
Release: 0
|
||||
Url: http://hplipopensource.com
|
||||
# Source0...Source9 is for sources from HP:
|
||||
# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.2.tar.gz
|
||||
# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.2.tar.gz.asc
|
||||
# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.4.tar.gz
|
||||
# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.4.tar.gz.asc
|
||||
# How to verify Source0 see: http://hplipopensource.com/node/327
|
||||
# For example: /usr/bin/gpg --keyserver pgp.mit.edu --recv-keys 0xA59047B9
|
||||
# /usr/bin/gpg --verify hplip-3.12.2.tar.gz.asc hplip-3.12.2.tar.gz
|
||||
# /usr/bin/gpg --verify hplip-3.12.4.tar.gz.asc hplip-3.12.4.tar.gz
|
||||
# must result: Good signature from "HPLIP (HP Linux Imaging and Printing) <hplip@hp.com>"
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Source0: hplip-%{version}.tar.gz
|
||||
# Patch0...Patch9 is for patches from HP:
|
||||
# Patch10...Patch99 is for Suse patches for the sources from HP:
|
||||
# Patch10 fixes "... is used uninitialized ..." warnings:
|
||||
@ -71,10 +77,9 @@ Patch12: hplip-3.9.8-CVE-2010-4267.patch
|
||||
# Source100... is for special Suse sources:
|
||||
# Source100 is the primary source for the suse_update_desktop_file stuff.
|
||||
# It is found automatically in $RPM_SOURCE_DIR by 'suse_update_desktop_file -i hplip':
|
||||
Source100: %{name}.desktop
|
||||
# Source101 is a wrapper for hp-toolbox which shows meaningful error messages even under X.
|
||||
# hp-toolbox.wrapper is called via hplip.desktop:
|
||||
Source101: hp-toolbox.wrapper
|
||||
Source100: hplip.desktop
|
||||
# Source101 hp-toolbox.wrapper was a wrapper for hp-toolbox which is no longer needed
|
||||
# see https://bugzilla.novell.com/show_bug.cgi?id=755820
|
||||
# Source102 is a small man page for /usr/bin/hpijs:
|
||||
Source102: hpijs.1.gz
|
||||
# Source103 was the init script for hpssd which is obsolete since version 2.8.4.
|
||||
@ -102,7 +107,10 @@ Patch101: change-udev-rules.diff
|
||||
Patch102: no-chgrp_lp_hplip_Logdir.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
|
||||
PreReq: coreutils
|
||||
PreReq: /bin/grep
|
||||
PreReq: /bin/sed
|
||||
PreReq: /usr/bin/find
|
||||
# Require the exact matching version-release of the hpijs sub-package to make sure
|
||||
# to have the exact matching version of libhpip and libhpmud installed.
|
||||
# The exact matching version-release of the sub-package is available on the same
|
||||
@ -124,12 +132,12 @@ Requires: foomatic-filters
|
||||
# (e.g. some PPDs for PostScript printers in OpenPrintingPPDs-postscript)
|
||||
# foomatic-rip can also be used without Ghostscript but for the drivers
|
||||
# HPIJS and HPCUPS Ghostscript is needed.
|
||||
# The RPM requirement for ghostscript-library should actually be
|
||||
# in the hplip-hpijs sub-package but this would bloat a minimalist system
|
||||
# The RPM requirement for ghostscript should actually be in the
|
||||
# hplip-hpijs sub-package but this would bloat a minimalist system
|
||||
# (see the comment for the hplip-hpijs sub-package below).
|
||||
# Therefore the hplip main package which is intended
|
||||
# to get "all the HPLIP stuff" installed has the RPM requirement:
|
||||
Requires: ghostscript-library
|
||||
Requires: ghostscript
|
||||
# Require special Python stuff (which pulls in Python base stuff).
|
||||
# At least since openSUSE 11.1 and SLE11 pyxml is no longer required
|
||||
# (pyxml was required in particular for openSUSE 10.3 and SLE10,
|
||||
@ -144,7 +152,8 @@ Requires: python-qt4
|
||||
# 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
|
||||
Requires: dbus-1-python >= 0.80
|
||||
Requires: python-gobject2
|
||||
# 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:
|
||||
@ -196,8 +205,8 @@ Group: Hardware/Printing
|
||||
# Since Nov 14 2007 ghostscript-library does no longer require /usr/bin/hpijs
|
||||
# but only "Suggests hplip-hpijs" (see Novell/Suse Bugzilla bnc#341564).
|
||||
# Have the matching "reverse suggests" = "Enhances" here
|
||||
# to document the ghostscript_any <-> hplip-hpijs relationship:
|
||||
Enhances: ghostscript_any
|
||||
# to document the ghostscript <-> hplip-hpijs relationship:
|
||||
Enhances: ghostscript
|
||||
# On a minimalist system only hplip-hpijs may be installed
|
||||
# or on a minimalist package repository (e.g. on the openSUSE CDs)
|
||||
# only hplip-hpijs may be available (even when a usual system is installed).
|
||||
@ -216,7 +225,7 @@ Enhances: ghostscript_any
|
||||
# may be not available to be installed (e.g. when hplip-hpijs-1.2.3-4.5 is
|
||||
# installed from the openSUSE CDs but on our official online repository
|
||||
# only hplip-1.2.3-6.7 is available which should usually also work):
|
||||
Suggests: hplip = %{version}
|
||||
Suggests: %{name} = %{version}
|
||||
# hpijs-standalone was a stand-alone minimalist package
|
||||
# which is no longer provided since a long time.
|
||||
# hplip-hpijs and hpijs-standalone both contain /usr/bin/hpijs
|
||||
@ -280,10 +289,10 @@ Group: Hardware/Scanner
|
||||
# which lets the whole scanning stack frontend<->libsane-dll<->libsane-backend crash
|
||||
# also for any other backend when the hpaio backend is enabled (e.g. "scanimage -L"):
|
||||
Requires: %{name}-hpijs = %{version}-%{release}
|
||||
# See comment in hpijs sub-package for same Suggests
|
||||
Suggests: hplip = %{version}
|
||||
# See comment in hpijs sub-package for same Suggests:
|
||||
Suggests: %{name} = %{version}
|
||||
# Automatically install this package if hpijs sub-package and sane-backends are
|
||||
# both installed
|
||||
# both installed:
|
||||
Supplements: packageand(%{name}-hpijs:sane-backends)
|
||||
Enhances: sane-backends
|
||||
|
||||
@ -342,7 +351,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
# --disable-foomatic-rip-hplip-install is explicitly set and as a consequence the "cupsFilter" entries
|
||||
# in the static PPDs are changed in the install section to use foomatic-rip.
|
||||
./configure --prefix=/usr \
|
||||
--libdir=%_libdir \
|
||||
--libdir=%{_libdir} \
|
||||
--disable-qt3 \
|
||||
--enable-qt4 \
|
||||
--disable-policykit \
|
||||
@ -375,6 +384,10 @@ make install DESTDIR=%{buildroot}
|
||||
rm %{buildroot}%{_sysconfdir}/sane.d/dll.conf
|
||||
# Remove the installed HAL fdi file because HAL is no longer used (HAL is deprecated):
|
||||
rm %{buildroot}%{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
|
||||
# Remove the outdated "Check and add printer for Suse 10.3 distro" udev rule
|
||||
# and let the build fail if it does no longer match to notify about the change:
|
||||
grep 'for Suse 10.3 distro' %{buildroot}%{_sysconfdir}/udev/rules.d/56-hpmud_add_printer.rules || exit 1
|
||||
sed -i -e '/for Suse 10.3 distro/,+1 d' %{buildroot}%{_sysconfdir}/udev/rules.d/56-hpmud_add_printer.rules
|
||||
# Begin "General tests and adjustments for all PPDs" (see manufacturer-PPDs.spec):
|
||||
pushd %{buildroot}%{_datadir}/cups/model/manufacturer-PPDs/%{name}
|
||||
# Do not pollute the build log file with zillions of meaningless messages:
|
||||
@ -439,18 +452,16 @@ popd
|
||||
# which points to foomatic-rip is installed:
|
||||
ln -s ../../../bin/foomatic-rip %{buildroot}/usr/lib/cups/filter/foomatic-rip-hplip
|
||||
# Begin "Desktop menue entry stuff":
|
||||
# Install the wrapper for hp-toolbox:
|
||||
install -m 755 %{SOURCE101} %{buildroot}%{_bindir}/hp-toolbox.wrapper
|
||||
# Install /usr/share/hplip/data/images/64x64/hp_logo.png as desktop icon file
|
||||
# because it is used in the hplip.desktop.in and hplip-systray.desktop.in sources:
|
||||
install -D -m 644 %{buildroot}%{_datadir}/%{name}/data/images/32x32/hp_logo.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/HPmenu.png
|
||||
install -D -m 644 %{buildroot}%{_datadir}/%{name}/data/images/64x64/hp_logo.png %%{buildroot}%{_datadir}/icons/hicolor/64x64/apps/HPmenu.png
|
||||
install -D -m 644 %{buildroot}%{_datadir}/%{name}/data/images/128x128/hp_logo.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/HPmenu.png
|
||||
install -D -m 644 %{buildroot}%{_datadir}/%{name}/data/images/256x256/hp_logo.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/HPmenu.png
|
||||
install -D -m 644 %{buildroot}%{_datadir}/hplip/data/images/32x32/hp_logo.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/HPmenu.png
|
||||
install -D -m 644 %{buildroot}%{_datadir}/hplip/data/images/64x64/hp_logo.png %%{buildroot}%{_datadir}/icons/hicolor/64x64/apps/HPmenu.png
|
||||
install -D -m 644 %{buildroot}%{_datadir}/hplip/data/images/128x128/hp_logo.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/HPmenu.png
|
||||
install -D -m 644 %{buildroot}%{_datadir}/hplip/data/images/256x256/hp_logo.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/HPmenu.png
|
||||
# Set up and install the desktop menue entry stuff using "Categories=System;Monitor;"
|
||||
# and remove HP's hplip.desktop and hplip-systray.desktop files before because we use Source100:
|
||||
# (additionally there is/was a typo in HP's install because of the trailing blank at 'applications ')
|
||||
rm %{buildroot}%{_datadir}/applications/%{name}*.desktop
|
||||
rm %{buildroot}%{_datadir}/applications/hplip*.desktop
|
||||
%suse_update_desktop_file -i %{name} System HardwareSettings Printing
|
||||
# Let suse_update_desktop_file add X-SuSE-translate key to /etc/xdg/autostart/hplip-systray.desktop
|
||||
# so that we can update its translations with translation-only packages.
|
||||
@ -547,6 +558,7 @@ exit 0
|
||||
%dir %{_sysconfdir}/udev
|
||||
%dir %{_sysconfdir}/udev/rules.d
|
||||
%config %{_sysconfdir}/udev/rules.d/55-hpmud.rules
|
||||
%config %{_sysconfdir}/udev/rules.d/56-hpmud_add_printer.rules
|
||||
%config %{_sysconfdir}/udev/rules.d/56-hpmud_support.rules
|
||||
%config %{_sysconfdir}/udev/rules.d/86-hpmud_plugin.rules
|
||||
%{_bindir}/hp-align
|
||||
@ -554,8 +566,10 @@ exit 0
|
||||
%{_bindir}/hp-check-plugin
|
||||
%{_bindir}/hp-clean
|
||||
%{_bindir}/hp-colorcal
|
||||
%{_bindir}/hp-config_usb_printer
|
||||
%{_bindir}/hp-devicesettings
|
||||
%{_bindir}/hp-diagnose_plugin
|
||||
%{_bindir}/hp-diagnose_queues
|
||||
%{_bindir}/hp-fab
|
||||
%{_bindir}/hp-faxsetup
|
||||
%{_bindir}/hp-firmware
|
||||
@ -579,7 +593,9 @@ exit 0
|
||||
%{_bindir}/hp-testpage
|
||||
%{_bindir}/hp-timedate
|
||||
%{_bindir}/hp-toolbox
|
||||
%{_bindir}/hp-uninstall
|
||||
%{_bindir}/hp-unload
|
||||
%{_bindir}/hp-upgrade
|
||||
%{_bindir}/hp-wificonfig
|
||||
%{_libdir}/python%{py_ver}/site-packages/cupsext.*
|
||||
%{_libdir}/python%{py_ver}/site-packages/hpmudext.*
|
||||
@ -590,15 +606,12 @@ exit 0
|
||||
/usr/lib/cups/backend/hpfax
|
||||
%dir /usr/lib/cups/filter
|
||||
/usr/lib/cups/filter/hpcupsfax
|
||||
%dir /var/lib/hp
|
||||
/var/lib/hp/hplip.state
|
||||
%doc %{_defaultdocdir}/%{name}/
|
||||
%{_bindir}/hp-toolbox.wrapper
|
||||
%{_datadir}/icons/hicolor/*/apps/HPmenu.png
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_bindir}/hp-systray.wrapper
|
||||
%{_datadir}/%{name}/
|
||||
%exclude %{_datadir}/%{name}/data/models/models.dat
|
||||
%{_datadir}/hplip/
|
||||
%exclude %{_datadir}/hplip/data/models/models.dat
|
||||
|
||||
%files hpijs
|
||||
%defattr(-, root, root)
|
||||
|
||||
@ -1,20 +1,20 @@
|
||||
--- Makefile.am.orig 2011-12-09 12:20:38.000000000 +0100
|
||||
+++ Makefile.am 2012-01-12 16:54:27.000000000 +0100
|
||||
@@ -506,14 +506,14 @@ endif
|
||||
install-dist_hplip_LogDATA:
|
||||
if FULL_BUILD
|
||||
test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
|
||||
- chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
|
||||
+# chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
|
||||
chmod 774 $(DESTDIR)$(hplip_Logdir)
|
||||
endif #FULL_BUILD
|
||||
if HPLIP_BUILD
|
||||
test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
|
||||
- chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
|
||||
+# chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
|
||||
chmod 774 $(DESTDIR)$(hplip_Logdir)
|
||||
-endif #FULL_BUILD
|
||||
+endif #HPLIP_BUILD
|
||||
|
||||
install-data-hook:
|
||||
if HPLIP_BUILD
|
||||
--- Makefile.am.orig 2012-04-10 10:35:14.000000000 +0200
|
||||
+++ Makefile.am 2012-04-13 12:05:40.000000000 +0200
|
||||
@@ -509,14 +509,14 @@ endif
|
||||
install-dist_hplip_LogDATA:
|
||||
if FULL_BUILD
|
||||
test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
|
||||
- chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
|
||||
+# chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
|
||||
chmod 774 $(DESTDIR)$(hplip_Logdir)
|
||||
endif #FULL_BUILD
|
||||
if HPLIP_BUILD
|
||||
test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
|
||||
- chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
|
||||
+# chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
|
||||
chmod 774 $(DESTDIR)$(hplip_Logdir)
|
||||
-endif #FULL_BUILD
|
||||
+endif #HPLIP_BUILD
|
||||
|
||||
install-data-hook:
|
||||
if HPLIP_BUILD
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user