- Make --qt4 the default for the systray applet, so that it appears in the

right place, again (bug #479751).
- Removed hal preprobe rules as they were causing breakage (bug #479648).

hplip.spec

@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.8.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -126,7 +126,8 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %build
 %configure --disable-foomatic-xml-install --disable-cups-install \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
-	--disable-foomatic-rip-hplip-install --enable-dbus
+	--disable-foomatic-rip-hplip-install --enable-dbus \
+	--enable-qt4
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
@@ -176,6 +177,9 @@ rm -f %{buildroot}%{_datadir}/hplip/hpijs.drv.in.template
 # window), so don't ship the launcher yet.
 rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 
+# Remove the hal preprobe rules as they were causing breakage (bug #479648).
+rm -f %{buildroot}%{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
+
 %clean
 rm -rf %{buildroot}
 
@@ -183,7 +187,6 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %doc COPYING doc/*
 %{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
-%{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
 %dir %{_sysconfdir}/hp
 %config(noreplace) %{_sysconfdir}/hp/hplip.conf
 %{_bindir}/hp-align
@@ -277,6 +280,7 @@ rm -rf %{buildroot}
 %{_datadir}/hplip/data/images
 %{_datadir}/hplip/plugins
 %{_datadir}/hplip/ui
+%{_datadir}/hplip/ui4
 
 %files -n hpijs
 %defattr(-,root,root)
@@ -313,6 +317,12 @@ fi
 exit 0
 
 %changelog
+* Tue Jan 13 2009 Tim Waugh <twaugh@redhat.com> 2.8.12-3
+- Make --qt4 the default for the systray applet, so that it appears
+  in the right place, again (bug #479751).
+- Removed hal preprobe rules as they were causing breakage
+  (bug #479648).
+
 * Mon Jan 12 2009 Tim Waugh <twaugh@redhat.com> 2.8.12-2
 - Don't write to system-wide configuration file (bug #479178).