rpms/hplip/devel hplip.fdi, NONE, 1.1 hplip-udev-rules.patch, 1.2, 1.3 hplip.spec, 1.157, 1.158

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7576

Modified Files:
	hplip-udev-rules.patch hplip.spec 
Added Files:
	hplip.fdi 
Log Message:
* Thu Sep  6 2007 Tim Waugh <twaugh at redhat.com> 2.7.7-4
- Reverted udev rules change.
- Ship a HAL FDI file to get correct access control on the USB device
  nodes (bug #251470).
- Make libsane-hpaio requires the main hplip package, needed for
  libhpip.so (bug #280281).



--- NEW FILE hplip.fdi ---
<?xml version="1.0" encoding="UTF-8"?> 

<deviceinfo version="0.2">
  <device>
    <!-- HPLIP-driven printers and scanners -->
    <match key="info.bus" 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-udev-rules.patch:

Index: hplip-udev-rules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-udev-rules.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hplip-udev-rules.patch	30 Aug 2007 15:27:19 -0000	1.2
+++ hplip-udev-rules.patch	6 Sep 2007 12:19:39 -0000	1.3
@@ -1,14 +1,12 @@
---- hplip-2.7.7/55-hpmud.rules.udev-rules	2007-05-17 17:48:16.000000000 +0100
-+++ hplip-2.7.7/55-hpmud.rules	2007-08-09 10:22:42.000000000 +0100
-@@ -1,5 +1,9 @@
+--- hplip-2.7.6/55-hpmud.rules.udev-rules	2007-07-20 14:13:01.000000000 +0100
++++ hplip-2.7.6/55-hpmud.rules	2007-07-20 14:13:32.000000000 +0100
+@@ -1,5 +1,7 @@
  # TODO: add PROGRAM rule for 7/xx/xx printer class interface
 -SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
 +SUBSYSTEM!="usb", GOTO="hpmud_rules_end"
 +ATTR{devnum}!="?*", GOTO="hpmud_rules_end"
 +ATTR{busnum}!="?*", GOTO="hpmud_rules_end"
-+ENV{PHYSDEVDRIVER}=="usblp", GOTO="hpmud_rules_end"
  ACTION!="add", GOTO="hpmud_rules_end"
 -SYSFS{idVendor}=="03f0", GROUP="lp"
 +SYSFS{idVendor}=="03f0", GROUP="lp", MODE="0664"
-+SYSFS{idVendor}=="03f0", SYMLINK+="scanner-%k"
  LABEL="hpmud_rules_end"


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- hplip.spec	30 Aug 2007 15:27:19 -0000	1.157
+++ hplip.spec	6 Sep 2007 12:19:39 -0000	1.158
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.7.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -12,7 +12,8 @@
 Conflicts: selinux-policy < 3.0.3-3
 
 Url: http://hplip.sourceforge.net/
-Source: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
+Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
+Source1: hplip.fdi
 Patch1: hplip-desktop.patch
 Patch3: hplip-quiet.patch
 Patch4: hplip-marker-supply.patch
@@ -34,6 +35,7 @@
 Requires: hpijs = %{hpijs_epoch}:%{version}-%{release}
 
 Requires: python-imaging
+Requires: hal
 
 BuildRequires: net-snmp-devel
 BuildRequires: cups-devel
@@ -79,6 +81,7 @@
 License: GPL
 Obsoletes: libsane-hpoj <= 0.91
 Requires: sane-backends
+Requires: %{name} = %{version}-%{release}
 ExcludeArch: s390 s390x
 
 %description -n libsane-hpaio
@@ -153,6 +156,9 @@
 	--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
+
 # Remove files we don't want to package.
 rm -f %{buildroot}%{_datadir}/hplip/hpaio.desc
 rm -f %{buildroot}%{_datadir}/hplip/hplip-install
@@ -165,6 +171,7 @@
 %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
@@ -271,6 +278,13 @@
 exit 0
 
 %changelog
+* Thu Sep  6 2007 Tim Waugh <twaugh at redhat.com> 2.7.7-4
+- Reverted udev rules change.
+- Ship a HAL FDI file to get correct access control on the USB device
+  nodes (bug #251470).
+- Make libsane-hpaio requires the main hplip package, needed for
+  libhpip.so (bug #280281).
+
 * Thu Aug 30 2007 Tim Waugh <twaugh at redhat.com> 2.7.7-3
 - Updated udev rules to allow scanning by console user.