Fix missing header in ippeveps.c, add .gz to man pages in RPM spec file (Red

Hat convention is to compress installed man pages)

diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index 9de45b2591189833f1478baa0f557319ce9e89db..93867f2c53146faedad1b4831763ae01db8a0789 100644 (file)
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -333,46 +333,46 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/locale/zh_CN/cups_zh_CN.po
 
 %dir /usr/share/man/man1
-/usr/share/man/man1/cancel.1
-/usr/share/man/man1/cups.1
-/usr/share/man/man1/cupstestppd.1
-/usr/share/man/man1/ippeveprinter.1
+/usr/share/man/man1/cancel.1.gz
+/usr/share/man/man1/cups.1.gz
+/usr/share/man/man1/cupstestppd.1.gz
+/usr/share/man/man1/ippeveprinter.1.gz
 %if %{?_with_dnssd:1}%{!?_with_dnssd:0}
 # DNS-SD
-/usr/share/man/man1/ippfind.1
+/usr/share/man/man1/ippfind.1.gz
 %endif
-/usr/share/man/man1/ipptool.1
-/usr/share/man/man1/lp.1
-/usr/share/man/man1/lpoptions.1
-/usr/share/man/man1/lpq.1
-/usr/share/man/man1/lpr.1
-/usr/share/man/man1/lprm.1
-/usr/share/man/man1/lpstat.1
+/usr/share/man/man1/ipptool.1.gz
+/usr/share/man/man1/lp.1.gz
+/usr/share/man/man1/lpoptions.1.gz
+/usr/share/man/man1/lpq.1.gz
+/usr/share/man/man1/lpr.1.gz
+/usr/share/man/man1/lprm.1.gz
+/usr/share/man/man1/lpstat.1.gz
 %dir /usr/share/man/man5
-/usr/share/man/man5/*.conf.5
-/usr/share/man/man5/cupsd-logs.5
-/usr/share/man/man5/ipptoolfile.5
-/usr/share/man/man5/mime.*.5
+/usr/share/man/man5/*.conf.5.gz
+/usr/share/man/man5/cupsd-logs.5.gz
+/usr/share/man/man5/ipptoolfile.5.gz
+/usr/share/man/man5/mime.*.5.gz
 %dir /usr/share/man/man7
-/usr/share/man/man7/ippevepcl.7
-/usr/share/man/man7/ippeveps.7
+/usr/share/man/man7/ippevepcl.7.gz
+/usr/share/man/man7/ippeveps.7.gz
 %dir /usr/share/man/man8
-/usr/share/man/man8/cups-deviced.8
-/usr/share/man/man8/cups-driverd.8
-/usr/share/man/man8/cups-exec.8
-/usr/share/man/man8/cups-snmp.8
-/usr/share/man/man8/cupsaccept.8
-/usr/share/man/man8/cupsctl.8
-/usr/share/man/man8/cupsfilter.8
-/usr/share/man/man8/cupsd.8
-/usr/share/man/man8/cupsd-helper.8
-/usr/share/man/man8/cupsdisable.8
-/usr/share/man/man8/cupsenable.8
-/usr/share/man/man8/cupsreject.8
-/usr/share/man/man8/lpadmin.8
-/usr/share/man/man8/lpc.8
-/usr/share/man/man8/lpinfo.8
-/usr/share/man/man8/lpmove.8
+/usr/share/man/man8/cups-deviced.8.gz
+/usr/share/man/man8/cups-driverd.8.gz
+/usr/share/man/man8/cups-exec.8.gz
+/usr/share/man/man8/cups-snmp.8.gz
+/usr/share/man/man8/cupsaccept.8.gz
+/usr/share/man/man8/cupsctl.8.gz
+/usr/share/man/man8/cupsfilter.8.gz
+/usr/share/man/man8/cupsd.8.gz
+/usr/share/man/man8/cupsd-helper.8.gz
+/usr/share/man/man8/cupsdisable.8.gz
+/usr/share/man/man8/cupsenable.8.gz
+/usr/share/man/man8/cupsreject.8.gz
+/usr/share/man/man8/lpadmin.8.gz
+/usr/share/man/man8/lpc.8.gz
+/usr/share/man/man8/lpinfo.8.gz
+/usr/share/man/man8/lpmove.8.gz
 
 %dir /var/cache/cups
 %attr(0775,root,sys) %dir /var/cache/cups/rss
@@ -391,13 +391,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/cups/examples
 /usr/share/cups/examples/*
 %dir /usr/share/man/man1
-/usr/share/man/man1/cups-config.1
-/usr/share/man/man1/ppd*.1
+/usr/share/man/man1/cups-config.1.gz
+/usr/share/man/man1/ppd*.1.gz
 %dir /usr/share/man/man5
-/usr/share/man/man5/ppdcfile.5
-/usr/share/man/man7/backend.7
-/usr/share/man/man7/filter.7
-/usr/share/man/man7/notifier.7
+/usr/share/man/man5/ppdcfile.5.gz
+/usr/share/man/man7/backend.7.gz
+/usr/share/man/man7/filter.7.gz
+/usr/share/man/man7/notifier.7.gz
 
 /usr/bin/cups-config
 /usr/bin/ppd*
@@ -435,4 +435,4 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/lib/cups/daemon
 /usr/lib/cups/daemon/cups-lpd
 %dir /usr/share/man/man8
-/usr/share/man/man8/cups-lpd.8
+/usr/share/man/man8/cups-lpd.8.gz

diff --git a/tools/ippeveps.c b/tools/ippeveps.c
index 38d7dd36d57fadfbaaa5fa80ef02d8fb82cdfb86..52e14ee167b774c8e42a0f2f6bcbe60a6923fe25 100644 (file)
--- a/tools/ippeveps.c
+++ b/tools/ippeveps.c
@@ -16,6 +16,7 @@
 #  include <cups/ppd-private.h>
 #endif /* !CUPS_LITE */
 #include <limits.h>
+#include <sys/wait.h>
 
 #ifdef __APPLE__
 #  define PDFTOPS CUPS_SERVERBIN "/filter/cgpdftops"