Accepting request 258498 from Printing

Version upgrade to 3.14.10 (forwarded request 258497 from jsmeix)

OBS-URL: https://build.opensuse.org/request/show/258498
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hplip?expand=0&rev=97

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 &'"
 +

hplip-3.14.10.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:11b3cd8311dea6b22a4c80be1e5d021e84d15a5f3e7e22cbd43798e5c1a89598
+size 21773429

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-----

hplip-3.14.6.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a57233cd0e2db1dcf1d34d8b90c6a9d3e027e522695aada6c3c411a839868b8e
-size 21603895

hplip-3.14.6.tar.gz.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iEYEABECAAYFAlONbUsACgkQc9dwzaWQR7nu0gCgpq2dT7qvrkIbaIarjUdX+EbC
-F5UAn3C6ZjcYma+F2hAuqC4973F6fAf1
-=cteQ
------END PGP SIGNATURE-----

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
 

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 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.6.tar.gz.asc
+# 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) <hplip@hp.com>"
 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