- Better defattr use in file manifests.

- Fixed mixed spaces and tabs.
- Fixed main package summary.
- Added comments for all sources and patches.
This commit is contained in:
Tim Waugh 2010-03-02 17:07:45 +00:00
parent 1604f77ebc
commit bc9add8298

View File

@ -2,13 +2,15 @@
%define cups_serverbin %{_exec_prefix}/lib/cups %define cups_serverbin %{_exec_prefix}/lib/cups
Name: gutenprint Name: gutenprint
Summary: Printer Drivers Package. Summary: Printer Drivers Package
Version: 5.2.5 Version: 5.2.5
Release: 3%{?dist} Release: 4%{?dist}
Group: System Environment/Base Group: System Environment/Base
URL: http://gimp-print.sourceforge.net/ URL: http://gimp-print.sourceforge.net/
Source0: http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2 Source0: http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
# Post-install script to update foomatic PPDs.
Source1: gutenprint-foomaticppdupdate Source1: gutenprint-foomaticppdupdate
# Post-install script to update CUPS native PPDs.
Source2: cups-genppdupdate.py.in Source2: cups-genppdupdate.py.in
Patch0: gutenprint-menu.patch Patch0: gutenprint-menu.patch
Patch1: gutenprint-O6.patch Patch1: gutenprint-O6.patch
@ -141,10 +143,15 @@ Epson, HP and compatible printers.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
# Fix menu placement of GIMP plugin.
%patch0 -p1 -b .menu %patch0 -p1 -b .menu
# Don't use -O6 compiler option.
%patch1 -p1 -b .O6 %patch1 -p1 -b .O6
# Restore file contexts when updating PPDs.
%patch2 -p1 -b .selinux %patch2 -p1 -b .selinux
# Don't claim support for Brother HL-2040.
%patch3 -p1 -b .brother-hl-2040 %patch3 -p1 -b .brother-hl-2040
# Allow the CUPS dynamic driver to run inside a build root.
%patch4 -p1 -b .postscriptdriver %patch4 -p1 -b .postscriptdriver
cp %{SOURCE2} src/cups/cups-genppdupdate.in cp %{SOURCE2} src/cups/cups-genppdupdate.in
@ -236,25 +243,26 @@ exit 0
%exclude %{_libdir}/*.la %exclude %{_libdir}/*.la
%files plugin %files plugin
%defattr(-, root, root,-)
%{_libdir}/gimp/*/plug-ins/gutenprint %{_libdir}/gimp/*/plug-ins/gutenprint
%files foomatic %files foomatic
%doc
%defattr(-, root, root,-) %defattr(-, root, root,-)
%doc
%{_sbindir}/gutenprint-foomaticppdupdate %{_sbindir}/gutenprint-foomaticppdupdate
%{_datadir}/foomatic/kitload.log %{_datadir}/foomatic/kitload.log
%{_datadir}/foomatic/db/source/driver/* %{_datadir}/foomatic/db/source/driver/*
%{_datadir}/foomatic/db/source/opt/* %{_datadir}/foomatic/db/source/opt/*
%files extras %files extras
%doc
%defattr(-, root, root,-) %defattr(-, root, root,-)
%doc
%{_bindir}/testpattern %{_bindir}/testpattern
%{_datadir}/gutenprint/samples/* %{_datadir}/gutenprint/samples/*
%files cups %files cups
%doc
%defattr(-, root, root,-) %defattr(-, root, root,-)
%doc
%{_datadir}/cups/calibrate.ppm %{_datadir}/cups/calibrate.ppm
%{cups_serverbin}/filter/* %{cups_serverbin}/filter/*
%{cups_serverbin}/driver/* %{cups_serverbin}/driver/*
@ -273,6 +281,12 @@ fi
/bin/rm -f /var/cache/foomatic/* /bin/rm -f /var/cache/foomatic/*
%changelog %changelog
* Tue Mar 2 2010 Tim Waugh <twaugh@redhat.com> 5.2.5-4
- Better defattr use in file manifests.
- Fixed mixed spaces and tabs.
- Fixed main package summary.
- Added comments for all sources and patches.
* Mon Feb 15 2010 Tim Waugh <twaugh@redhat.com> 5.2.5-3 * Mon Feb 15 2010 Tim Waugh <twaugh@redhat.com> 5.2.5-3
- The cups sub-package requires the exactly-matching main gutenprint - The cups sub-package requires the exactly-matching main gutenprint
package. package.