From 8adcbd5af7c63139f2fb55679370a1e598af93c1a99304aff7c972b20c7ec044 Mon Sep 17 00:00:00 2001
From: Johannes Meixner <jsmeix@suse.com>
Date: Thu, 15 Oct 2009 14:18:08 +0000
Subject: [PATCH] Accepting request 22456 from home:jsmeix:branches:Printing

Copy from home:jsmeix:branches:Printing/hplip via accept of submit request 22456 revision 2.

OBS-URL: https://build.opensuse.org/request/show/22456
OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=9
---
 hplip.changes |  8 ++++++++
 hplip.spec    | 13 +++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/hplip.changes b/hplip.changes
index 0eeba04..85e59e2 100644
--- a/hplip.changes
+++ b/hplip.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Oct 15 15:52:41 CEST 2009 - jsmeix@suse.de
+
+- Also moved /usr/share/hplip/data/models/models.dat
+  and /etc/hp/hplip.conf to the hplip-hpijs sub-package
+  so that the "hp" backend can autodetect printers
+  (see Novell/Suse Bugzilla bnc#546856 comment#10).
+
 -------------------------------------------------------------------
 Thu Oct 15 11:14:28 CEST 2009 - jsmeix@suse.de
 
diff --git a/hplip.spec b/hplip.spec
index 984ed3a..85ca4ac 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -182,7 +182,6 @@ Group:          Hardware/Printing
 # to document the ghostscript_any <-> hplip-hpijs relationship:
 Enhances:       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
@@ -477,12 +476,12 @@ exit 0
 
 %files
 %defattr(-, root, root)
-%config %{_sysconfdir}/hp/
+%config %{_sysconfdir}/xdg/autostart/hplip-systray.desktop
+%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/hplip
 %dir %{_sysconfdir}/udev
 %dir %{_sysconfdir}/udev/rules.d
 %config %{_sysconfdir}/udev/rules.d/55-hpmud.rules
 %config %{_sysconfdir}/udev/rules.d/56-hpmud_support.rules
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/hplip
 %dir %{_datadir}/hal
 %dir %{_datadir}/hal/fdi
 %dir %{_datadir}/hal/fdi/information
@@ -491,8 +490,6 @@ exit 0
 %dir %{_datadir}/hal/fdi/preprobe
 %dir %{_datadir}/hal/fdi/preprobe/10osvendor
 %{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
-%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
-%{_datadir}/%{name}/
 %{_bindir}/hp-align
 %{_bindir}/hp-check
 %{_bindir}/hp-clean
@@ -540,11 +537,14 @@ exit 0
 %{_bindir}/hp-toolbox.wrapper
 %{_datadir}/pixmaps/HPmenu.png
 %{_datadir}/applications/%{name}.desktop
+%{_datadir}/%{name}/
+%exclude %{_datadir}/%{name}/data/models/models.dat
 
 %files hpijs
 %defattr(-, root, root)
-%doc %{_mandir}/man1/hpijs.1.gz
+%config %{_sysconfdir}/hp/
 %{_bindir}/hpijs
+%doc %{_mandir}/man1/hpijs.1.gz
 %{_libdir}/libhpip.*
 %{_libdir}/libhpmud.*
 %dir %{_libdir}/cups
@@ -559,5 +559,6 @@ exit 0
 %dir %{_datadir}/cups/model
 %dir %{_datadir}/cups/model/manufacturer-PPDs
 %{_datadir}/cups/model/manufacturer-PPDs/%{name}/
+%{_datadir}/%{name}/data/models/models.dat
 
 %changelog