From 841de4b25320d9f69fd7853abb6bc0a38b3e211e63f39ad3f5101d69d44a56c4 Mon Sep 17 00:00:00 2001
From: Johannes Meixner <jsmeix@suse.com>
Date: Fri, 14 Oct 2011 07:23:00 +0000
Subject: [PATCH] Accepting request 87727 from home:vuntz:branches:Printing

Split sane driver in subpackage

OBS-URL: https://build.opensuse.org/request/show/87727
OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=38
---
 hplip.changes |  7 +++++++
 hplip.spec    | 34 +++++++++++++++++++++++++++++-----
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/hplip.changes b/hplip.changes
index 8e0bba2..5b864cf 100644
--- a/hplip.changes
+++ b/hplip.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Oct 13 13:57:46 UTC 2011 - vuntz@opensuse.org
+
+- Split the sane driver in a hplip-sane subpackage, so that it's
+  not necessary to install the full hplip tools to use an
+  all-in-one HP printer. See bnc#723870.
+
 -------------------------------------------------------------------
 Tue Oct  4 12:44:11 CEST 2011 - jsmeix@suse.de
 
diff --git a/hplip.spec b/hplip.spec
index 5930988..0aa6813 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -86,10 +86,9 @@ PreReq:         coreutils, /bin/grep, /bin/sed, /usr/bin/find
 # 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
 # repository where the main-package is (compare the "Recommends: hplip" entry below).
-# A wrong library version may let libsane-hpaio crash (e.g. segfault)
-# 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}
+# Same rationale for the sane subpackage.
+Requires:       %{name}-sane = %{version}-%{release}
 # Because foomatic-rip-hplip has CVE-2011-2697 (bnc#698451)
 # plus a leftover in CVE-2004-0801 (bnc#59233)
 # foomatic-rip-hplip is no longer installed and foomatic-rip
@@ -252,6 +251,28 @@ the main-package package hplip must be installed.
 For full documentation and license see the main-package hplip.
 
 
+%package sane
+License:        BSD3c(or similar) ; GPLv2+ ; MIT License (or similar)
+Summary:        Only plain scanning with HPLIP scan drivers
+Group:          Hardware/Scanner
+# 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.
+# A wrong library version may let libsane-hpaio crash (e.g. segfault)
+# 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}
+# Automatically install this package if hpijs sub-package and sane-backends are
+# both installed
+Supplements:    packageand(%{name}-hpijs:sane-backends)
+Enhances:       sane-backends
+
+%description sane
+This sub-package includes only what is needed for plain scanning
+with the scan drivers in HPLIP for standard HP all-in-one printers.
+
+
 %prep
 # Be quiet when unpacking:
 %setup -q
@@ -525,8 +546,6 @@ exit 0
 %{_libdir}/python%{py_ver}/site-packages/hpmudext.*
 %{_libdir}/python%{py_ver}/site-packages/pcardext.*
 %{_libdir}/python%{py_ver}/site-packages/scanext.*
-%dir %{_libdir}/sane
-%{_libdir}/sane/libsane-hpaio.*
 %dir /usr/lib/cups
 %dir /usr/lib/cups/backend
 /usr/lib/cups/backend/hpfax
@@ -567,4 +586,9 @@ exit 0
 %{_datadir}/cups/model/manufacturer-PPDs/%{name}/
 %{_datadir}/%{name}/data/models/models.dat
 
+%files sane
+%defattr(-, root, root)
+%dir %{_libdir}/sane
+%{_libdir}/sane/libsane-hpaio.*
+
 %changelog