Merge branch 'f12' into f13

This commit is contained in:
Tim Waugh 2010-09-22 10:29:25 +01:00
commit d5c872fead

View File

@ -427,7 +427,7 @@ rm -rf %{buildroot}
%dir %{_datadir}/ppd/HP %dir %{_datadir}/ppd/HP
%{_datadir}/ppd/HP/*.ppd.gz %{_datadir}/ppd/HP/*.ppd.gz
%{_datadir}/cups/drv/* %{_datadir}/cups/drv/*
# Note: this must be /usr/lib not %{_libdir}, since that's the # Note: this must be /usr/lib not %%{_libdir}, since that's the
# CUPS serverbin directory. # CUPS serverbin directory.
/usr/lib/cups/filter/hpcac /usr/lib/cups/filter/hpcac
/usr/lib/cups/filter/hpcups /usr/lib/cups/filter/hpcups
@ -460,6 +460,10 @@ fi
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%changelog %changelog
* Wed Sep 22 2010 Tim Waugh <twaugh@redhat.com>
- More fixes from package review:
- Avoided another macro in comment.
* Mon Sep 20 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.6-5 * Mon Sep 20 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.6-5
- Increased timeouts for curl, wget, ping for high latency networks (bug #635388). - Increased timeouts for curl, wget, ping for high latency networks (bug #635388).