rpms/hplip/F-11 hplip.fdi,1.5,1.6 hplip.spec,1.220,1.221

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8771

Modified Files:
	hplip.spec 
Added Files:
	hplip.fdi 
Log Message:
* Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8
- Use hal rules instead of udev for F-11 (no udev ACL support).



Index: hplip.fdi
===================================================================
RCS file: hplip.fdi
diff -N hplip.fdi
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hplip.fdi	24 Aug 2009 14:35:42 -0000	1.6
@@ -0,0 +1,19 @@
+<?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>


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- hplip.spec	24 Aug 2009 14:20:54 -0000	1.220
+++ hplip.spec	24 Aug 2009 14:35:42 -0000	1.221
@@ -14,6 +14,7 @@ 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
@@ -122,7 +123,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 	--enable-scan-build --enable-gui-build --enable-fax-build \
 	--disable-foomatic-rip-hplip-install \
 	--enable-qt4 --enable-hpcups-install --enable-cups-drv-install \
-	--enable-hpijs-install --enable-udev-acl-rules
+	--enable-hpijs-install
 
 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
@@ -137,7 +138,7 @@ make install DESTDIR=%{buildroot}
 # Remove unpackaged files
 rm -rf	%{buildroot}%{_sysconfdir}/sane.d \
 	%{buildroot}%{_docdir} \
-	%{buildroot}%{_datadir}/hal/fdi
+	%{buildroot}%{_sysconfdir}/udev/rules.d/*
 
 rm -f	%{buildroot}%{_bindir}/foomatic-rip \
 	%{buildroot}%{_libdir}/cups/filter/foomatic-rip \
@@ -159,6 +160,10 @@ 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 {} \;
 
@@ -172,13 +177,16 @@ rm -f %{buildroot}%{_datadir}/hplip/hpij
 # 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/*
-%{_sysconfdir}/udev/rules.d/*
+%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
 %dir %{_sysconfdir}/hp
 %config(noreplace) %{_sysconfdir}/hp/hplip.conf
 %{_bindir}/hp-align
@@ -319,6 +327,7 @@ exit 0
 
 %changelog
 * Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8
+- Use hal rules instead of udev for F-11 (no udev ACL support).
 - Build no longer requires libudev-devel.
 - Fixed state reasons handling problems (bug #501338).