Accepting request 137049 from home:jsmeix:branches:Printing

Version upgrade to 3.12.9 plus fix for bnc#780413

OBS-URL: https://build.opensuse.org/request/show/137049
OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=55

hplip.spec

@@ -15,7 +15,6 @@
 # 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):
@@ -51,20 +50,20 @@ BuildRequires:  sane-backends
 %endif
 BuildRequires:  update-desktop-files
 Summary:        HP's Printing, Scanning, and Faxing Software
-License:        BSD-3-Clause ; GPL-2.0+ ; MIT
+License:        BSD-3-Clause and GPL-2.0+ and MIT
 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.6
+Version:        3.12.9
 Release:        0
 Url:            http://hplipopensource.com
 # Source0...Source9 is for sources from HP:
-# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.6.tar.gz
-# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.6.tar.gz.asc
+# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.9.tar.gz
+# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.9.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.6.tar.gz.asc hplip-3.12.6.tar.gz
+#              /usr/bin/gpg --verify hplip-3.12.9.tar.gz.asc hplip-3.12.9.tar.gz
 # must result: Good signature from "HPLIP (HP Linux Imaging and Printing) <hplip@hp.com>"
 Source0:        hplip-%{version}.tar.gz
 # Patch0...Patch9 is for patches from HP:
@@ -105,11 +104,15 @@ Source106:      hp-systray.wrapper
 # Patch100... is for special Suse patches:
 # Patch101 changes the udev rules files 55-hpmud.rules and 56-hpmud_support.rules:
 Patch101:       change-udev-rules.diff
-# Patch102 deactivates the "chgrp lp -R /var/log/hp" in Makefile.am
+# Patch102 no-chgrp_lp_hplip_Logdir.diff deactivates the "chgrp lp -R /var/log/hp" in Makefile.am
 # because during install this results "Operation not permitted"
 # this is done in the files section via attr(0774,root,lp)
 # where mode 0774 matches to what is set in Makefile.am:
 Patch102:       no-chgrp_lp_hplip_Logdir.diff
+# Patch103 no-hplip_cron.diff deactivates the "cron" stuff in Makefile.am
+# because it lets build fail on SLE11 products (possibly an autoconf issue)
+# and we (i.e. SUSE) do not allow to install /etc/cron.daily/hplip_cron
+Patch103:       no-hplip_cron.diff
 # Install into this non-root directory (required when norootforbuild is used):
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         coreutils
@@ -321,11 +324,15 @@ with the scan drivers in HPLIP for standard HP all-in-one printers.
 # Patch101 change-udev-rules.diff
 # changes the udev rules files 55-hpmud.rules and 56-hpmud_support.rules:
 %patch101
-# Patch102 deactivates the "chgrp lp -R /var/log/hp" in Makefile.am
+# Patch102 no-chgrp_lp_hplip_Logdir.diff deactivates the "chgrp lp -R /var/log/hp" in Makefile.am
 # because during install this results "Operation not permitted"
 # this is done in the files section via attr(0774,root,lp)
 # where mode 0774 matches to what is set in Makefile.am:
 %patch102
+# Patch103 no-hplip_cron.diff deactivates the "cron" stuff in Makefile.am
+# because it lets build fail on SLE11 products (possibly an autoconf issue)
+# and we (i.e. SUSE) do not allow to install /etc/cron.daily/hplip_cron
+%patch103
 
 %build
 # If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake)
@@ -387,6 +394,16 @@ make
 
 %install
 make install DESTDIR=%{buildroot}
+# The /var/lib/hp directory is created everywhere except on openSUSE 12.2 and later versions
+# (perhaps an autoconf issue) so that it is created here as simple and fail-safe workaround
+# see https://bugs.launchpad.net/bugs/1018303 and bnc#780413
+# using fixed "/var/log/hp" because this is hardcoded in the HPLIP sources
+# regarding owner and permissions see the "files hpijs" section below
+# and Patch102 no-chgrp_lp_hplip_Logdir.diff:
+test -d %{buildroot}/var/lib/hp || install -d %{buildroot}/var/lib/hp
+# Provide hplip_cron as /usr/share/doc/packages/hplip/hplip_cron
+# see Patch103 no-hplip_cron.diff:
+install -m 644 data/rules/hplip_cron %{buildroot}%{_defaultdocdir}/%{name}/
 # Remove the installed /etc/sane.d/dll.conf
 # because this is provided by the sane-backends package:
 rm %{buildroot}%{_sysconfdir}/sane.d/dll.conf
@@ -579,6 +596,7 @@ exit 0
 %{_bindir}/hp-info
 %{_bindir}/hp-levels
 %{_bindir}/hp-linefeedcal
+%{_bindir}/hp-logcapture
 %{_bindir}/hp-makecopies
 %{_bindir}/hp-makeuri
 %{_bindir}/hp-mkuri