rpms/hplip/F-8 hplip.fdi, 1.1, 1.2 hplip.spec, 1.161, 1.162 hplip-udev-rules.patch, 1.3, NONE
Tim Waugh (twaugh)
fedora-extras-commits at redhat.com
Fri Jan 4 18:06:08 UTC 2008
Author: twaugh
Update of /cvs/pkgs/rpms/hplip/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17874
Modified Files:
hplip.fdi hplip.spec
Removed Files:
hplip-udev-rules.patch
Log Message:
* Fri Jan 4 2008 Tim Waugh <twaugh at redhat.com> 2.7.7-7
- Don't ship udev rules; instead, grant an ACL for group lp (bug #424331).
Index: hplip.fdi
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-8/hplip.fdi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hplip.fdi 6 Sep 2007 12:19:39 -0000 1.1
+++ hplip.fdi 4 Jan 2008 18:05:19 -0000 1.2
@@ -6,6 +6,7 @@
<match key="info.bus" contains="usb_device">
<match key="usb_device.vendor_id" int="0x03f0">
<append key="info.capabilities" type="strlist">scanner</append>
+ <append key="access_control.grant_group" type="strlist">lp</append>
</match>
</match>
Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-8/hplip.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- hplip.spec 9 Oct 2007 16:31:53 -0000 1.161
+++ hplip.spec 4 Jan 2008 18:05:19 -0000 1.162
@@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 2.7.7
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@@ -19,7 +19,6 @@
Patch3: hplip-quiet.patch
Patch4: hplip-marker-supply.patch
Patch5: hplip-libm.patch
-Patch6: hplip-udev-rules.patch
Patch8: hplip-libsane.patch
Patch9: hplip-media-empty.patch
Patch11: hplip-unload-traceback.patch
@@ -108,9 +107,6 @@
# libhpip should link against libm (bug #197599).
%patch5 -p1 -b .libm
-# Fix the udev rules file (bug #248740).
-%patch6 -p1 -b .udev-rules
-
# Link libsane-hpaio against libsane (bug #234813).
%patch8 -p1 -b .libsane
@@ -141,7 +137,8 @@
# Remove unpackaged files
rm -rf %{buildroot}%{_sysconfdir}/sane.d \
- %{buildroot}%{_docdir}
+ %{buildroot}%{_docdir} \
+ %{_sysconfdir}/udev/rules.d/*
rm -f %{buildroot}%{_bindir}/foomatic-rip \
%{buildroot}%{_libdir}/cups/filter/foomatic-rip \
@@ -175,7 +172,6 @@
%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
@@ -283,6 +279,9 @@
exit 0
%changelog
+* Fri Jan 4 2008 Tim Waugh <twaugh at redhat.com> 2.7.7-7
+- Don't ship udev rules; instead, grant an ACL for group lp (bug #424331).
+
* Tue Oct 9 2007 Tim Waugh <twaugh at redhat.com> 2.7.7-6
- Use raw instead of 1284.4 communication for LJ4000 series (bug #249191).
- Build requires openssl-devel.
--- hplip-udev-rules.patch DELETED ---
More information about the fedora-extras-commits
mailing list