diff --git a/change-udev-rules.diff b/change-udev-rules.diff index d6ba680..44ebc36 100644 --- a/change-udev-rules.diff +++ b/change-udev-rules.diff @@ -37,7 +37,7 @@ @@ -12,7 +34,10 @@ - # This rule will add the printer and install plugin + # This rule will check the smart install feature, plugin status and firmware download for the required printers. -ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c 'if [ -f /usr/bin/systemctl ]; then /usr/bin/systemctl --no-block start hplip-printer@$env{BUSNUM}:$env{DEVNUM}.service; else /usr/bin/nohup /usr/bin/python /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM} ; fi &'" +#ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c 'if [ -f /usr/bin/systemctl ]; then /usr/bin/systemctl --no-block start hplip-printer@$env{BUSNUM}:$env{DEVNUM}.service; else /usr/bin/nohup /usr/bin/python /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM} ; fi &'" + diff --git a/hplip-3.14.10.tar.gz b/hplip-3.14.10.tar.gz new file mode 100644 index 0000000..e172abc --- /dev/null +++ b/hplip-3.14.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11b3cd8311dea6b22a4c80be1e5d021e84d15a5f3e7e22cbd43798e5c1a89598 +size 21773429 diff --git a/hplip-3.14.10.tar.gz.asc b/hplip-3.14.10.tar.gz.asc new file mode 100644 index 0000000..e527fbb --- /dev/null +++ b/hplip-3.14.10.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAlQzq2kACgkQc9dwzaWQR7kFZwCfVxHaORmTNA7jyexSGPKrXGoY +bWIAnjTK/xMAsx0un81KEWS/h2GFyB9V +=Vbpn +-----END PGP SIGNATURE----- diff --git a/hplip-3.14.6.tar.gz b/hplip-3.14.6.tar.gz deleted file mode 100644 index 6cb44af..0000000 --- a/hplip-3.14.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a57233cd0e2db1dcf1d34d8b90c6a9d3e027e522695aada6c3c411a839868b8e -size 21603895 diff --git a/hplip-3.14.6.tar.gz.asc b/hplip-3.14.6.tar.gz.asc deleted file mode 100644 index c87f51f..0000000 --- a/hplip-3.14.6.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAlONbUsACgkQc9dwzaWQR7nu0gCgpq2dT7qvrkIbaIarjUdX+EbC -F5UAn3C6ZjcYma+F2hAuqC4973F6fAf1 -=cteQ ------END PGP SIGNATURE----- diff --git a/hplip.changes b/hplip.changes index f1f8bb2..326c7ba 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,74 @@ +------------------------------------------------------------------- +Mon Oct 27 12:15:11 CET 2014 - jsmeix@suse.de + +- change-udev-rules.diff: Adapted for HPLIP 3.14.10. +- Version upgrade to 3.14.10: + Added Support for the Following New Printers: + HP Deskjet 2541 All-in-One Printer + HP Envy 4501 e-All-in-One + HP Envy 4503 e-All-in-One + HP Envy 4505 e-All-in-One + HP Envy 4507 e-All-in-One + HP Envy 4508 e-All-in-One + HP ENVY 5534 e-All-in-One Printer + HP Envy 5640 e-All-in-One + HP Envy 5642 e-All-in-One + HP Envy 5643 e-All-in-One + HP Envy 5644 e-All-in-One + HP Envy 5660 e-All-in-One + HP Envy 5665 e-All-in-One + HP Envy 7640 e-All-in-One + HP Envy 7645 e-All-in-One + HP LaserJet Pro MFP M125r + HP LaserJet Pro MFP M125ra + HP LaserJet Pro M201n Printer + HP LaserJet Pro M201dw Printer + HP LaserJet Pro M202n Printer + HP LaserJet Pro M202dw Printer + HP LaserJet Pro MFP M225rdn + HP LaserJet Pro MFP M225dw + HP LaserJet Pro MFP M225dn + HP LaserJet Pro MFP M226dw + HP LaserJet Pro MFP M226dn + HP LaserJet Enterprise MFP M630dn + HP LaserJet Enterprise MFP M630f + HP LaserJet Enterprise MFP M630h + HP LaserJet Enterprise Flow MFP M630z + HP Officejet 5740 e-All-in-One + HP Officejet 5742 e-All-in-One + HP Officejet 5745 e-All-in-One + HP OfficeJet 8040 e-All-in-One + HP OfficeJet 6810 e-All-in-One Printer Series + HP OfficeJet 6812 e-All-in-One Printer + HP OfficeJet 6815 e-All-in-One Printer + HP Officejet 7612 Wide Format e-All-in-One Printer + HP OfficeJet Pro 6230 ePrinter + HP OfficeJet Pro 6830 e-All-in-one + HP OfficeJet Pro 6835 e-All-in-one + HP OfficeJet Pro 8616 e-All-in-One Printer + Some bug fixes. + For details see + http://hplipopensource.com/hplip-web/release_notes.html + +------------------------------------------------------------------- +Thu Oct 16 15:37:28 CEST 2014 - jsmeix@suse.de + +- Make and install Python compiled bytecode files + (.pyc compiled python and .pyo optimized compiled python) + because normal users do not have write permissions to the + install location /usr/share/hplip/ so that for normal users + Python would recompile the sources every time, + see https://en.opensuse.org/openSUSE:Packaging_Python +- Hardlink .pyc and .pyo when they have same content but + do not run "fdupes buildroot/_datadir/hplip" because + fdupes will link any files with same content there + which can have unexpected side-effects (cf. bnc#784670). +- Removed RPM preun script that had deleted leftover .pyc + and .pyo files if made during run-time (see the entry below + dated Fri Feb 16 11:52:28 CET 2007) because now those files + are provided in the package. +- Removed trailing whitespaces in RPM changelog file. + ------------------------------------------------------------------- Thu Sep 18 10:31:14 CEST 2014 - jsmeix@suse.de @@ -397,7 +468,7 @@ Fri Sep 28 12:42:33 UTC 2012 - mmeister@suse.com HP's upstream fix is insufficient (not 64-bit safe), see https://bugs.launchpad.net/hplip/+bug/1017496 - Adapted no-chgrp_lp_hplip_Logdir.diff so that it - applies to the HPLIP 3.12.9 sources. + applies to the HPLIP 3.12.9 sources. ------------------------------------------------------------------ Fri Sep 28 08:20:55 UTC 2012 - mmeister@suse.com @@ -782,7 +853,7 @@ Thu Aug 6 10:48:36 CEST 2009 - jsmeix@suse.de Enabled mDNS as the default network search mechanism. Added front-end support for mDNS/Bonjour in setup. Added hpmud support for mDNS. - The tar ball provides a init-suse-firewall init script + The tar ball provides a init-suse-firewall init script for mDNS support which is not included in the RPM. Fixed wificonfig associate issue when called from hp-setup. Added 40-hplip.rules to the tar ball for distros with @@ -834,7 +905,7 @@ Tue Jun 2 14:46:19 CEST 2009 - jsmeix@suse.de "invalid conversion from 'const char*' to 'char*'" errors. The upstream bug report is https://bugs.launchpad.net/hplip/+bug/382720 - + ------------------------------------------------------------------- Tue May 5 14:54:42 CEST 2009 - jsmeix@suse.de @@ -884,7 +955,7 @@ Tue May 5 14:54:42 CEST 2009 - jsmeix@suse.de Many more supported printers and all-in-one devices. Several bug fixes (no Suse bugs). For details see - http://hplipopensource.com/hplip-web/release_notes.html + http://hplipopensource.com/hplip-web/release_notes.html - Updated to version 2.8.9: Added Qt4 configure option but Qt3 is the default. Many bug fixes (no Suse bugs). @@ -966,8 +1037,8 @@ 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. + 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 @@ -978,7 +1049,7 @@ Tue Sep 9 14:33:28 CEST 2008 - jsmeix@suse.de 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). + Several bug fixes (no Suse bugs). Many more supported printers. For details see release_notes.html - Updated to version 2.8.5: @@ -1060,7 +1131,7 @@ Thu Apr 3 15:59:09 CEST 2008 - jsmeix@suse.de but hp-toolbox and hp-sendfax launch hp-systray automatically and there is also /etc/xdg/autostart/hplip-systray.desktop. When no HPLIP tools are running (e.g. hp-toolbox), - and the user closes or disables hp-systray, + and the user closes or disables hp-systray, there will be no HPLIP processes running whatsoever. Many bug fixes (no Suse bugs). One more supported LaserJet ZJStream printers (M1120), @@ -1068,7 +1139,7 @@ Thu Apr 3 15:59:09 CEST 2008 - jsmeix@suse.de where the latter has a new printer device class (PSB9100). For details see release_notes.html - Adapted the hplip init script to provide backward compatibility: - It still exists to avoid that printer/scanner setup tools fail + It still exists to avoid that printer/scanner setup tools fail when they try to enable the "hplip" service but all it does is to stop a possibly running hpssd. @@ -1111,7 +1182,7 @@ Thu Feb 21 14:35:36 CET 2008 - jsmeix@suse.de Added foomatic-rip-hplip support. Foomatic-rip-hplip is for distros that do not have the latest foomatic-rip which is required for drv support. - Updated the krgb patch for gpl ghostscript 8.61. + Updated the krgb patch for gpl ghostscript 8.61. Updated the "hp" backend to return only hplip supported devices during device discovery. If the device is not in models.dat the "hp" backend will exclude it. @@ -1318,7 +1389,7 @@ Thu Feb 1 15:02:59 CET 2007 - jsmeix@suse.de requires cups-libs because of /usr/bin/hpijs). - 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. + a HPLIP library nor a CUPS library to run it. ------------------------------------------------------------------- Wed Jan 31 13:50:12 CET 2007 - jsmeix@suse.de @@ -1397,14 +1468,14 @@ Mon Sep 11 12:14:32 CEST 2006 - jsmeix@suse.de (instead of explicit only cupsext.so and pcardext.so) so that it works now both for Python 2.4 and 2.5 (the latter installs additional *.egg-info files). - + ------------------------------------------------------------------- Mon Sep 4 12:00:12 CEST 2006 - jsmeix@suse.de - Exchanged the hard RPM requirement for ghostscript_any by a supplements entry for hplip-hpijs so that there is no longer a mutual (cyclic) hard RPM dependency between hplip-hpijs - and ghostscript-library. + and ghostscript-library. ------------------------------------------------------------------- Thu Aug 3 11:37:07 CEST 2006 - jsmeix@suse.de @@ -1527,14 +1598,14 @@ Tue Jan 3 14:52:07 CET 2006 - jsmeix@suse.de ------------------------------------------------------------------- Thu Dec 22 15:29:13 CET 2005 - ro@suse.de -- requires: PyQt -> python-qt +- requires: PyQt -> python-qt ------------------------------------------------------------------- Thu Dec 1 16:01:58 CET 2005 - jsmeix@suse.de - Removed unneeded KDE packages from "neededforbuild" since the new package python-qt was split from kdebindings3-python - (see Suse Bugzilla bnc#135250). + (see Suse Bugzilla bnc#135250). ------------------------------------------------------------------- Mon Nov 28 11:30:30 CET 2005 - jsmeix@suse.de @@ -1613,7 +1684,7 @@ Sun Apr 10 12:13:29 CEST 2005 - coolo@suse.de ------------------------------------------------------------------- Tue Mar 22 11:59:00 CET 2005 - jsmeix@suse.de -- Added PreReq. +- Added PreReq. ------------------------------------------------------------------- Thu Mar 17 10:53:11 CET 2005 - jsmeix@suse.de @@ -1657,7 +1728,7 @@ Tue Feb 15 16:57:52 CET 2005 - jsmeix@suse.de ------------------------------------------------------------------- Tue Feb 1 17:06:20 CET 2005 - jsmeix@suse.de -- Updated to version 0.8.7, for details see ChangeLog and +- Updated to version 0.8.7, for details see ChangeLog and http://hpinkjet.sourceforge.net/updates.php - Added triggerin and postun scripts to add and remove the SANE backend "hpaio" in /etc/sane.d/dll.conf diff --git a/hplip.spec b/hplip.spec index d650bc2..81233af 100644 --- a/hplip.spec +++ b/hplip.spec @@ -73,15 +73,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.14.6 +Version: 3.14.10 Release: 0 Url: http://hplipopensource.com # Source0...Source9 is for sources from HP: -# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.14.6.tar.gz -# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.14.6.tar.gz.asc +# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.14.10.tar.gz +# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.14.10.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.14.6.tar.gz.asc hplip-3.14.6.tar.gz +# /usr/bin/gpg --verify hplip-3.14.10.tar.gz.asc hplip-3.14.10.tar.gz # must result: Good signature from "HPLIP (HP Linux Imaging and Printing) " Source0: http://prdownloads.sourceforge.net/hplip/hplip-%{version}.tar.gz Source1: http://prdownloads.sourceforge.net/hplip/hplip-%{version}.tar.gz.asc @@ -431,6 +431,30 @@ make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} +# Make and install Python compiled bytecode files +# (.pyc compiled python and .pyo optimized compiled python) +# because normal users do not have write permissions +# to the install location /usr/share/hplip/ so that +# for normal users Python would recompile the sources every time +# which results longer program startup time and waste of CPU for compiling, +# see https://en.opensuse.org/openSUSE:Packaging_Python#Byte_Compiled_Files +# and http://lists.opensuse.org/opensuse-packaging/2014-10/msg00028.html +# Make and install .pyc files: +%py_compile %{buildroot}%{_datadir}/hplip +# Make and install .pyo files: +%py_compile -O %{buildroot}%{_datadir}/hplip +# Hardlink .pyc and .pyo when they have same content. +# Do not run "fdupes buildroot/_datadir/hplip" because +# fdupes will link any files with same content there +# which can have unexpected side-effects, compare +# https://bugzilla.opensuse.org/show_bug.cgi?id=784670 +for pyc in $( find %{buildroot}%{_datadir}/hplip -name '*.pyc' ) +do pyo="${pyc%.pyc}.pyo" + if test -f $pyo && cmp -s $pyc $pyo + then echo hardlinking $pyc and $pyo because both have same content + ln -f $pyc $pyo + fi +done # HPLIP's "make install" installs -rw-r--r-- usr/share/hplip/fax/pstotiff # and usr/lib/cups/filter/pstotiff -> usr/share/hplip/fax/pstotiff # so that when the CUPS filter usr/lib/cups/filter/pstotiff is called, @@ -606,19 +630,6 @@ then if ! grep -q 'hpaio' /etc/sane.d/dll.conf fi exit 0 -%preun -# If the package was removed and if it was updated -# remove all byte-compiled Python .pyc (and perhaps .pyo) files -# which are created at run-time by Python in /usr/share/hplip/. -# Use a generic method via "find" so that it works in any case -# without the need to maintain a long list of individual files. -# Even if this may accidentally remove "foreign" .pyc/.pyo files -# which do not originate from matching .py files from this package -# (e.g. third-party stuff in /usr/share/hplip/), there is no damage -# because Python could re-create them or work only with .py files. -find /usr/share/hplip/ -name '*.py[co]' -delete -exit 0 - %postun %if 0%{?suse_version} >= 1140 %desktop_database_postun