- Install udev rules in correct place (bug #530378).

This commit is contained in:
Tim Waugh 2010-01-14 12:37:44 +00:00
parent e8c252a3a6
commit 15e970ec8d

View File

@ -9,7 +9,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.4.2 Version: 1.4.2
Release: 20%{?dist} Release: 21%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -378,9 +378,9 @@ extension=phpcups.so
__EOF__ __EOF__
# Install the udev rules. # Install the udev rules.
%{__mkdir_p} %{buildroot}%{_sysconfdir}/udev/rules.d %{__mkdir_p} %{buildroot}/lib/udev/rules.d
install -m644 %{SOURCE3} \ install -m644 %{SOURCE3} \
%{buildroot}%{_sysconfdir}/udev/rules.d/70-cups-libusb.rules %{buildroot}/lib/udev/rules.d/70-cups-libusb.rules
%post %post
/sbin/chkconfig --del cupsd 2>/dev/null || true # Make sure old versions aren't there anymore /sbin/chkconfig --del cupsd 2>/dev/null || true # Make sure old versions aren't there anymore
@ -442,7 +442,7 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE.txt README.txt CREDITS.txt CHANGES.txt %doc LICENSE.txt README.txt CREDITS.txt CHANGES.txt
%{_sysconfdir}/udev/rules.d/70-cups-libusb.rules /lib/udev/rules.d/70-cups-libusb.rules
%dir %attr(0755,root,lp) /etc/cups %dir %attr(0755,root,lp) /etc/cups
%dir %attr(0755,root,lp) /var/run/cups %dir %attr(0755,root,lp) /var/run/cups
%dir %attr(0511,lp,sys) /var/run/cups/certs %dir %attr(0511,lp,sys) /var/run/cups/certs
@ -553,6 +553,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so %{php_extdir}/phpcups.so
%changelog %changelog
* Thu Jan 14 2010 Tim Waugh <twaugh@redhat.com> - 1:1.4.2-21
- Install udev rules in correct place (bug #530378).
* Wed Dec 23 2009 Tim Waugh <twaugh@redhat.com> - 1:1.4.2-20 * Wed Dec 23 2009 Tim Waugh <twaugh@redhat.com> - 1:1.4.2-20
- Fixed patch for STR #3425 again by adding in back-ported change from - Fixed patch for STR #3425 again by adding in back-ported change from
svn revision 8929 (bug #549899). No longer need svn revision 8929 (bug #549899). No longer need