- Use upstream udev rules instead of hal policy (bug #518172).

hplip.fdi

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-
-<deviceinfo version="0.2">
-  <device>
-    <!-- HPLIP-driven printers and scanners -->
-    <match key="info.subsystem" contains="usb_device">
-      <match key="usb_device.vendor_id" int="0x03f0">
-        <append key="info.capabilities" type="strlist">scanner</append>
-      </match>
-    </match>
-
-    <!-- Set ACLs -->
-    <match key="info.capabilities" contains="scanner">
-      <append key="info.capabilities" type="strlist">access_control</append>
-      <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-      <merge key="access_control.type" type="string">scanner</merge>
-    </match>
-  </device>
-</deviceinfo>

hplip.spec

@@ -13,7 +13,6 @@ Conflicts: selinux-policy < 3.0.3-3
 
 Url: http://hplip.sourceforge.net/
 Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
-Source1: hplip.fdi
 Patch1: hplip-hpcups-reorder.patch
 Patch2: hplip-strstr-const.patch
 Patch3: hplip-ui-optional.patch
@@ -111,7 +110,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 	--enable-scan-build --enable-gui-build --enable-fax-build \
 	--disable-foomatic-rip-hplip-install --enable-dbus \
 	--enable-qt4 --enable-hpcups-install --enable-cups-drv-install \
-	--enable-hpijs-install
+	--enable-hpijs-install --enable-udev-acl-rules
 
 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
@@ -126,7 +125,7 @@ make install DESTDIR=%{buildroot}
 # Remove unpackaged files
 rm -rf	%{buildroot}%{_sysconfdir}/sane.d \
 	%{buildroot}%{_docdir} \
-	%{buildroot}%{_sysconfdir}/udev/rules.d/*
+	%{buildroot}%{_datadir}/hal/fdi
 
 rm -f	%{buildroot}%{_bindir}/foomatic-rip \
 	%{buildroot}%{_libdir}/cups/filter/foomatic-rip \
@@ -148,9 +147,6 @@ desktop-file-install --vendor HP				\
 	--add-category Application				\
 	hplip.desktop
 
-mkdir -p %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor
-install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
-
 # Images in docdir should not be executable (bug #440552).
 find doc/images -type f -exec chmod 644 {} \;
 
@@ -164,16 +160,13 @@ 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}
 
 %files
 %defattr(-,root,root)
 %doc COPYING doc/*
-%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
+%{_sysconfdir}/udev/rules.d/*
 %dir %{_sysconfdir}/hp
 %config(noreplace) %{_sysconfdir}/hp/hplip.conf
 %{_bindir}/hp-align
@@ -313,7 +306,8 @@ fi
 exit 0
 
 %changelog
-* Tue Aug 18 2009 Tim Waugh <twaugh@redhat.com> 3.9.8-5
+* Wed Aug 19 2009 Tim Waugh <twaugh@redhat.com> 3.9.8-5
+- Use upstream udev rules instead of hal policy (bug #518172).
 - Removed unnecessary dependency on PyQt as we only use PyQt4 now.
 
 * Wed Aug 12 2009 Tim Waugh <twaugh@redhat.com> 3.9.8-4