From 80c84de48071038170797c0c5357b9b4c4f76e57025f91e6409f7f4aa80af53d Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Tue, 16 Sep 2008 10:44:00 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/hplip?expand=0&rev=34

---
 hplip.changes |  8 ++++++++
 hplip.spec    | 34 +++++++++++++++++++++++++---------
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/hplip.changes b/hplip.changes
index 75b7741..b031c3f 100644
--- a/hplip.changes
+++ b/hplip.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Sep 16 08:35:58 CEST 2008 - jsmeix@suse.de
+
+- Added "Recommends: hplip" to hplip-hpijs because when only
+  hplip-hpijs is there, it should tell the dependency resolver
+  that for usual functionality, hplip should be installed
+  too (if possible).
+
 -------------------------------------------------------------------
 Thu Sep 11 08:28:02 CEST 2008 - jsmeix@suse.de
 
diff --git a/hplip.spec b/hplip.spec
index daad89f..5ab2383 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -25,7 +25,7 @@ Summary:        HP's Printing, Scanning, and Faxing Software
 # 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:        2.8.7
-Release:        1
+Release:        2
 Group:          Hardware/Printing
 License:        BSD 3-Clause; GPL v2 or later; X11/MIT
 Url:            http://hpinkjet.sourceforge.net/
@@ -64,8 +64,10 @@ Patch102:       force-qt4-for-hp-systray-desktop.diff
 # Install into this non-root directory (required when norootforbuild is used):
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         coreutils, /bin/grep, /bin/sed, /usr/bin/find
-# Require the exact matching version of the hpijs sub-package to make sure
+# 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.
+# 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"):
@@ -173,14 +175,23 @@ Authors:
 License:        BSD 3-Clause; GPL v2 or later; X11/MIT
 Summary:        HPIJS for HP's printing and scanning software HPLIP
 Group:          Hardware/Printing
-# Mutual RPM package requirements are meanwhile considered to be bad because
-# such cyclic dependencies which makes it harder to automatically solve dependencies.
-# Actually the hpijs driver requires Ghostscript (i.e ghostscript_any, e.g. ghostscript-library).
-# But ghostscript-library must also require the hpijs driver which is the more imortant requirement
-# because when a user (or a printer setup tool) wants to set up a HP printer with the hpijs driver
-# it must be 100% sure that all what the hpijs driver needs to run is also installed.
-# Therefore the requirement is weakened for this package:
+# Since Nov 14 2007 ghostscript-library does no longer require /usr/bin/hpijs
+# but only "Suggests hplip-hpijs" (see Novell/Suse Bugzilla bnc#341564).
+# When ghostscript-library is installed, try to install hplip-hpijs if it is available:
 Supplements:    ghostscript_any
+# On a minimalist system only hplip-hpijs may be installed
+# (e.g. because of the above supplements for ghostscript_any)
+# or on a minimalist package repository (e.g. on the openSUSE CDs)
+# only hplip-hpijs may be available (even when a usual system is installed).
+# When only hplip-hpijs is there, it should tell the dependency resolver
+# that for usual functionality, hplip should be installed too (if possible).
+# Recommend only the matching version of the hplip main-package
+# (compare the "Requires: hplip-hpijs" entry above) but do not depend
+# on the exact matching release because the exact matching release
+# may be not available to be installed (e.g. when hplip-hpijs-1.2.3-4.5 is
+# installed from the openSUSE CDs but on our official online repository
+# only hplip-1.2.3-6.7 is available which should usually also work):
+Recommends:     hplip = %{version}
 # hplip-hpijs and hpijs-standalone both contain /usr/bin/hpijs
 # so that both packages have a RPM conflict.
 # But when the minimalist hpijs-standalone is to be replaced
@@ -469,6 +480,11 @@ exit 0
 %{_libdir}/libhpmud.*
 
 %changelog
+* Tue Sep 16 2008 jsmeix@suse.de
+- Added "Recommends: hplip" to hplip-hpijs because when only
+  hplip-hpijs is there, it should tell the dependency resolver
+  that for usual functionality, hplip should be installed
+  too (if possible).
 * Thu Sep 11 2008 jsmeix@suse.de
 - force-qt4-for-hp-systray-desktop.diff forces Gnome and KDE
   to execute hp-systray as "hp-systray --qt4" via