From b8d820e99fb5563c60ad4fb3907ef83e385b3c503fd7695ba2b4516938d0ff10 Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Fri, 15 Feb 2013 15:38:15 +0000 Subject: [PATCH] Accepting request 155552 from home:jsmeix:branches:Printing HPLIP version upgrade to 3.13.2. OBS-URL: https://build.opensuse.org/request/show/155552 OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=63 --- change-udev-rules.diff | 42 +++++++++++++++++++++++++++++------------- disable-chgrp_lp.diff | 14 +++++++------- hplip-3.12.11.tar.gz | 3 --- hplip-3.13.2.tar.gz | 3 +++ hplip.changes | 14 ++++++++++++++ hplip.spec | 11 ++++++----- no-hplip_cron.diff | 18 +++++++++--------- 7 files changed, 68 insertions(+), 37 deletions(-) delete mode 100644 hplip-3.12.11.tar.gz create mode 100644 hplip-3.13.2.tar.gz diff --git a/change-udev-rules.diff b/change-udev-rules.diff index 4da9a10..c72400a 100644 --- a/change-udev-rules.diff +++ b/change-udev-rules.diff @@ -276,9 +276,9 @@ -LABEL="hpmud_rules_end" +LABEL="hpmud_support_rules_end" + ---- data/rules/86-hpmud_plugin.rules.orig 2012-09-04 14:33:13.000000000 +0200 -+++ data/rules/86-hpmud_plugin.rules 2012-10-04 15:46:25.000000000 +0200 -@@ -1,13 +1,15 @@ +--- data/rules/86-hpmud_plugin.rules.orig 2013-02-13 17:37:21.000000000 +0100 ++++ data/rules/86-hpmud_plugin.rules 2013-02-15 14:54:43.000000000 +0100 +@@ -1,13 +1,13 @@ # Load hp firmware for this printer. -ACTION!="add", GOTO="hpmud_rules_end" @@ -286,17 +286,33 @@ #Check and add printer for Suse 10.3 distro # hp_Marvel_Device (These printer requires the plugin files. installling when device is detected) --SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/python /usr/bin/hp-check-plugin -m $env{BUSNUM}:$env{DEVNUM} &'" --SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/python /usr/bin/hp-check-plugin -m $env{BUSNUM}:$env{DEVNUM}&'" -+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="??17", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/python /usr/bin/hp-check-plugin -m $env{BUSNUM}:$env{DEVNUM} &'" -+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="??2a", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/python /usr/bin/hp-check-plugin -m $env{BUSNUM}:$env{DEVNUM}&'" +-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/python /usr/share/hplip/check-plugin.py -m $env{BUSNUM}:$env{DEVNUM} &'" +-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/python /usr/share/hplip/check-plugin.py -m $env{BUSNUM}:$env{DEVNUM}&'" ++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="??17", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/python /usr/share/hplip/check-plugin.py -m $env{BUSNUM}:$env{DEVNUM} &'" ++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="??2a", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/python /usr/share/hplip/check-plugin.py -m $env{BUSNUM}:$env{DEVNUM}&'" #Check and add printer for other distros --SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/python /usr/bin/hp-check-plugin -m %c &'" --SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/python /usr/bin/hp-check-plugin -m %c &'" +-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/python /usr/share/hplip/check-plugin.py -m %c &'" +-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/python /usr/share/hplip/check-plugin.py -m %c &'" -LABEL="hpmud_rules_end" -+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="??17", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/python /usr/bin/hp-check-plugin -m %c &'" -+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="??2a", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/python /usr/bin/hp-check-plugin -m %c &'" -+ ++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="??17", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/python /usr/share/hplip/check-plugin.py -m %c &'" ++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="??2a", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/python /usr/share/hplip/check-plugin.py -m %c &'" +LABEL="hpmud_plugin_rules_end" -+ +--- data/rules/56-hpmud_add_printer.rules.orig 2013-02-13 17:37:21.000000000 +0100 ++++ data/rules/56-hpmud_add_printer.rules 2013-02-15 14:58:58.000000000 +0100 +@@ -1,11 +1,11 @@ + # Load hp firmware for this printer. + +-ACTION!="add", GOTO="hpmud_rules_end" ++ACTION!="add", GOTO="hpmud_add_printer_rules_end" + + #Check and add printer for Suse 10.3 distro +-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="????", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM} &'" ++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="????", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM} &'" + + #Check and add printer +-SUBSYSTEM=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="????", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/hp-config_usb_printer %c &'" ++SUBSYSTEM=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="????", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/hp-config_usb_printer %c &'" + +-LABEL="hpmud_rules_end" ++LABEL="hpmud_add_printer_rules_end" diff --git a/disable-chgrp_lp.diff b/disable-chgrp_lp.diff index 3f2d8a5..a1ecbcc 100644 --- a/disable-chgrp_lp.diff +++ b/disable-chgrp_lp.diff @@ -1,18 +1,18 @@ ---- Makefile.am.orig 2012-11-20 10:55:15.000000000 +0100 -+++ Makefile.am 2012-11-29 16:08:51.000000000 +0100 -@@ -552,24 +552,24 @@ endif +--- Makefile.am.orig 2013-02-13 17:38:51.000000000 +0100 ++++ Makefile.am 2013-02-15 15:16:00.000000000 +0100 +@@ -563,24 +563,24 @@ 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 777 $(DESTDIR)$(hplip_Logdir) + chmod 775 $(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 777 $(DESTDIR)$(hplip_Logdir) + chmod 775 $(DESTDIR)$(hplip_Logdir) endif #FULL_BUILD install-dist_hplip_tmpDATA: @@ -20,12 +20,12 @@ test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir) - chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) +# chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) - chmod 1777 $(DESTDIR)$(hplip_tmpdir) + chmod 1775 $(DESTDIR)$(hplip_tmpdir) endif #FULL_BUILD if HPLIP_BUILD test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir) - chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) +# chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) - chmod 1777 $(DESTDIR)$(hplip_tmpdir) + chmod 1775 $(DESTDIR)$(hplip_tmpdir) endif #FULL_BUILD diff --git a/hplip-3.12.11.tar.gz b/hplip-3.12.11.tar.gz deleted file mode 100644 index 00e86be..0000000 --- a/hplip-3.12.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c5b81167b21aa4ee6bdf3f5c120bfa050d0c794608da8bcc32e2580234919ffa -size 21932088 diff --git a/hplip-3.13.2.tar.gz b/hplip-3.13.2.tar.gz new file mode 100644 index 0000000..38c4a96 --- /dev/null +++ b/hplip-3.13.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7dee21c30a15729b2107713a1b779ea07982064a38e2d4935e58e6f56d6d3592 +size 21681714 diff --git a/hplip.changes b/hplip.changes index 05f2d9c..664abb8 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Feb 15 15:31:28 CET 2013 - jsmeix@suse.de + +- Version upgrade to 3.13.2: + Several more supported printers and all-in-one devices + (in particular several "HP Officejet Pro X..." models). + New self diagnose and healing utility "hp-doctor" + but "hp-check-plugin" is no longer provided. + Several bug fixes. + For details see + http://hplipopensource.com/hplip-web/release_notes.html +- Adapted change-udev-rules.diff disable-chgrp_lp.diff + and no-hplip_cron.diff for HPLIP 3.13.2. + ------------------------------------------------------------------- Thu Jan 24 14:51:24 CET 2013 - jsmeix@suse.de diff --git a/hplip.spec b/hplip.spec index 497b851..7cca42a 100644 --- a/hplip.spec +++ b/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): @@ -58,15 +59,15 @@ Group: Hardware/Printing # where 'a' or 'b' do not mean 'alpha' or 'beta' but 'second' or 'third' release in the month # (usually bugfix releases have the suffix like 3.12.10a = first bugfix release for 3.12.10). # Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc -Version: 3.12.11 +Version: 3.13.2 Release: 0 Url: http://hplipopensource.com # Source0...Source9 is for sources from HP: -# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.11.tar.gz -# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.11.tar.gz.asc +# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.13.2.tar.gz +# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.13.2.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.11.tar.gz.asc hplip-3.12.11.tar.gz +# /usr/bin/gpg --verify hplip-3.13.2.tar.gz.asc hplip-3.13.2.tar.gz # must result: Good signature from "HPLIP (HP Linux Imaging and Printing) " Source0: hplip-%{version}.tar.gz # Patch0...Patch9 is for patches from HP: @@ -602,13 +603,13 @@ exit 0 %config %{_sysconfdir}/udev/rules.d/86-hpmud_plugin.rules %{_bindir}/hp-align %{_bindir}/hp-check -%{_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-doctor %{_bindir}/hp-fab %{_bindir}/hp-faxsetup %{_bindir}/hp-firmware diff --git a/no-hplip_cron.diff b/no-hplip_cron.diff index 67f17d8..5b54091 100644 --- a/no-hplip_cron.diff +++ b/no-hplip_cron.diff @@ -1,6 +1,6 @@ ---- Makefile.am.disable-chgrp_lp.diff.applied 2012-11-29 16:49:56.000000000 +0100 -+++ Makefile.am 2012-11-29 16:51:13.000000000 +0100 -@@ -107,8 +107,8 @@ hp_mkuri_LDADD = -ldl libhpmud.la +--- Makefile.am.disable-chgrp_lp.diff.applied 2013-02-15 15:18:08.000000000 +0100 ++++ Makefile.am 2013-02-15 15:21:13.000000000 +0100 +@@ -110,8 +110,8 @@ hp_mkuri_LDADD = -ldl libhpmud.la hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" # cron files @@ -11,13 +11,13 @@ # hpmud.rules rulesdir = /etc/udev/rules.d -@@ -573,17 +573,17 @@ if HPLIP_BUILD - chmod 1777 $(DESTDIR)$(hplip_tmpdir) +@@ -584,17 +584,17 @@ if HPLIP_BUILD + chmod 1775 $(DESTDIR)$(hplip_tmpdir) endif #FULL_BUILD -install-dist_cronDATA:$(dist_cron_DATA) - test -z "$(DESTDIR)$(crondir)" || $(MKDIR_P) "$(DESTDIR)$(crondir)"; \ -- list='$(dist_cron_DATA)'; test -n "$(crondir)" || list=; \ +- list='$(dist_cron_DATA)'; test -n "$(crondir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ @@ -25,10 +25,10 @@ - while read files; do \ - echo " $(INSTALL) -m755 $$files '$(DESTDIR)$(crondir)'"; \ - $(INSTALL) -m755 $$files "$(DESTDIR)$(crondir)" || exit $$?; \ -- done +- done +#install-dist_cronDATA:$(dist_cron_DATA) +# test -z "$(DESTDIR)$(crondir)" || $(MKDIR_P) "$(DESTDIR)$(crondir)"; \ -+# list='$(dist_cron_DATA)'; test -n "$(crondir)" || list=; \ ++# list='$(dist_cron_DATA)'; test -n "$(crondir)" || list=; \ +# for p in $$list; do \ +# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +# echo "$$d$$p"; \ @@ -36,7 +36,7 @@ +# while read files; do \ +# echo " $(INSTALL) -m755 $$files '$(DESTDIR)$(crondir)'"; \ +# $(INSTALL) -m755 $$files "$(DESTDIR)$(crondir)" || exit $$?; \ -+# done ++# done install-data-hook: if HPLIP_BUILD