Merge branch 'f16'

This commit is contained in:
Tim Waugh 2012-01-06 14:43:13 +00:00
commit e7cddeec9c

View File

@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer
Name: ghostscript Name: ghostscript
Version: %{gs_ver} Version: %{gs_ver}
Release: 8%{?dist} Release: 9%{?dist}
# Included CMap data is Redistributable, no modification permitted, # Included CMap data is Redistributable, no modification permitted,
# see http://bugzilla.redhat.com/487510 # see http://bugzilla.redhat.com/487510
@ -328,9 +328,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root) %defattr(-,root,root)
%{_datadir}/cups/model/pxl* %{_datadir}/cups/model/pxl*
%{_datadir}/cups/mime/*.convs %{_datadir}/cups/mime/*.convs
# This really is /usr/lib, not _libdir -- it's more of a libexec usage %{_cups_serverbin}/filter/*
# but upstream CUPS won't use libexec.
/usr/lib/cups/filter/*
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
@ -343,6 +341,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgs.so %{_libdir}/libgs.so
%changelog %changelog
* Fri Jan 6 2012 Tim Waugh <twaugh@redhat.com> 9.04-9
- Use %%_cups_serverbin macro.
* Fri Jan 6 2012 Tim Waugh <twaugh@redhat.com> 9.04-8 * Fri Jan 6 2012 Tim Waugh <twaugh@redhat.com> 9.04-8
- Rebuilt for GCC 4.7. - Rebuilt for GCC 4.7.