Fix packaging of man pages and commands.

2 files changed, 95 insertions, 117 deletions

diff --git a/packaging/cups.list.in b/packaging/cups.list.in
index c442101be..e2e7b69ed 100644
--- a/packaging/cups.list.in
+++ b/packaging/cups.list.in
@@ -194,7 +194,7 @@ $sysconfdir=@sysconfdir@
 $top_srcdir=@top_srcdir@
 
 #
-# ESP variables...
+# CUPS variables...
 #
 
 $AMANDIR=@AMANDIR@
@@ -229,13 +229,6 @@ $CUPS_PERM=0@CUPS_CONFIG_FILE_PERM@
 
 $INSTALLSTATIC=@INSTALLSTATIC@
 
-$MAN1EXT=@MAN1EXT@
-$MAN3EXT=@MAN3EXT@
-$MAN5EXT=@MAN5EXT@
-$MAN7EXT=@MAN7EXT@
-$MAN8EXT=@MAN8EXT@
-$MAN8DIR=@MAN8DIR@
-
 $LIBZ=@LIBZ@
 $DSOLIBS=@DSOLIBS@
 
@@ -310,25 +303,16 @@ f 0555 root sys $SERVERBIN/daemon/cups-lpd scheduler/cups-lpd
 %subpackage
 
 # Admin commands
-d 0755 root sys $BINDIR -
-l 0755 root sys $BINDIR/enable $SBINDIR/cupsaccept
-l 0755 root sys $BINDIR/disable $SBINDIR/cupsaccept
-d 0755 root sys $LIBDIR -
-l 0755 root sys $LIBDIR/accept $SBINDIR/cupsaccept
-l 0755 root sys $LIBDIR/lpadmin $SBINDIR/lpadmin
-l 0755 root sys $LIBDIR/reject $SBINDIR/cupsaccept
 d 0755 root sys $SBINDIR -
-l 0755 root sys $SBINDIR/accept cupsaccept
 f 0555 root sys $SBINDIR/cupsaccept systemv/cupsaccept
 f 0555 root sys $SBINDIR/cupsctl systemv/cupsctl
-l 0755 root sys $SBINDIR/cupsdisable accept
-l 0755 root sys $SBINDIR/cupsenable accept
-l 0755 root sys $SBINDIR/cupsreject accept
+l 0755 root sys $SBINDIR/cupsdisable cupsaccept
+l 0755 root sys $SBINDIR/cupsenable cupsaccept
+l 0755 root sys $SBINDIR/cupsreject cupsaccept
 f 0555 root sys $SBINDIR/lpadmin systemv/lpadmin
 f 0555 root sys $SBINDIR/lpc berkeley/lpc
 f 0555 root sys $SBINDIR/lpinfo systemv/lpinfo
 f 0555 root sys $SBINDIR/lpmove systemv/lpmove
-l 0755 root sys $SBINDIR/reject cupsaccept
 
 %system irix
 l 0755 root sys /usr/etc/lpc $SBINDIR/lpc
@@ -609,69 +593,65 @@ f 0444 root sys $DOCDIR/ru doc/ru/*.html
 
 # Man pages
 d 0755 root sys $AMANDIR -
-d 0755 root sys $AMANDIR/man$MAN8DIR -
+d 0755 root sys $AMANDIR/man8 -
 d 0755 root sys $MANDIR -
 d 0755 root sys $MANDIR/man1 -
 d 0755 root sys $MANDIR/man5 -
 d 0755 root sys $MANDIR/man7 -
 
-f 0444 root sys $MANDIR/man1/cancel.$MAN1EXT man/cancel.$MAN1EXT
-f 0444 root sys $MANDIR/man1/cups.$MAN1EXT man/cups.$MAN1EXT
-f 0444 root sys $MANDIR/man1/cupstestppd.$MAN1EXT man/cupstestppd.$MAN1EXT
-f 0444 root sys $MANDIR/man1/ippeveprinter.$MAN1EXT man/ippeveprinter.$MAN1EXT
-f 0444 root sys $MANDIR/man1/ippfind.$MAN1EXT man/ippfind.$MAN1EXT
-f 0444 root sys $MANDIR/man1/ipptool.$MAN1EXT man/ipptool.$MAN1EXT
-f 0444 root sys $MANDIR/man1/lp.$MAN1EXT man/lp.$MAN1EXT
-f 0444 root sys $MANDIR/man1/lpoptions.$MAN1EXT man/lpoptions.$MAN1EXT
-f 0444 root sys $MANDIR/man1/lpq.$MAN1EXT man/lpq.$MAN1EXT
-f 0444 root sys $MANDIR/man1/lpr.$MAN1EXT man/lpr.$MAN1EXT
-f 0444 root sys $MANDIR/man1/lprm.$MAN1EXT man/lprm.$MAN1EXT
-f 0444 root sys $MANDIR/man1/lpstat.$MAN1EXT man/lpstat.$MAN1EXT
-
-f 0444 root sys $MANDIR/man5/classes.conf.$MAN5EXT man/classes.conf.$MAN5EXT
-f 0444 root sys $MANDIR/man5/client.conf.$MAN5EXT man/client.conf.$MAN5EXT
-f 0444 root sys $MANDIR/man5/cups-files.conf.$MAN5EXT man/cups-files.conf.$MAN5EXT
-f 0444 root sys $MANDIR/man5/cups-snmp.conf.$MAN5EXT man/cups-snmp.conf.$MAN5EXT
-f 0444 root sys $MANDIR/man5/cupsd.conf.$MAN5EXT man/cupsd.conf.$MAN5EXT
-f 0444 root sys $MANDIR/man5/cupsd-logs.$MAN5EXT man/cupsd-logs.$MAN5EXT
-f 0444 root sys $MANDIR/man5/ipptoolfile.$MAN5EXT man/ipptoolfile.$MAN5EXT
-f 0444 root sys $MANDIR/man5/mailto.conf.$MAN5EXT man/mailto.conf.$MAN5EXT
-f 0444 root sys $MANDIR/man5/mime.convs.$MAN5EXT man/mime.convs.$MAN5EXT
-f 0444 root sys $MANDIR/man5/mime.types.$MAN5EXT man/mime.types.$MAN5EXT
-f 0444 root sys $MANDIR/man5/printers.conf.$MAN5EXT man/printers.conf.$MAN5EXT
-
-f 0444 root sys $MANDIR/man7/ippevepcl.$MAN7EXT man/ippevepcl.$MAN7EXT
-l 0644 root sys $MANDIR/man7/ippeveps.$MAN7EXT ippevepcl.$MAN7EXT
-
-l 0644 root sys $AMANDIR/man$MAN8DIR/accept.$MAN8EXT cupsaccept.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/cupsaccept.$MAN8EXT man/cupsaccept.$MAN8EXT
-l 0644 root sys $AMANDIR/man$MAN8DIR/cupsreject.$MAN8EXT cupsaccept.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/cupsctl.$MAN8EXT man/cupsctl.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/cupsfilter.$MAN8EXT man/cupsfilter.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/cups-snmp.$MAN8EXT man/cups-snmp.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/cupsd.$MAN8EXT man/cupsd.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/cupsd-helper.$MAN8EXT man/cupsd-helper.$MAN8EXT
-l 0644 root sys $AMANDIR/man$MAN8DIR/cupsdisable.$MAN8EXT cupsenable.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/cupsenable.$MAN8EXT man/cupsenable.$MAN8EXT
-l 0644 root sys $AMANDIR/man$MAN8DIR/disable.$MAN8EXT cupsenable.$MAN8EXT
-l 0644 root sys $AMANDIR/man$MAN8DIR/enable.$MAN8EXT cupsenable.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/lpadmin.$MAN8EXT man/lpadmin.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/lpc.$MAN8EXT man/lpc.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/lpinfo.$MAN8EXT man/lpinfo.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/lpmove.$MAN8EXT man/lpmove.$MAN8EXT
-l 0644 root sys $AMANDIR/man$MAN8DIR/reject.$MAN8EXT cupsaccept.$MAN8EXT
+f 0444 root sys $MANDIR/man1/cancel.1 man/cancel.1
+f 0444 root sys $MANDIR/man1/cups.1 man/cups.1
+f 0444 root sys $MANDIR/man1/cupstestppd.1 man/cupstestppd.1
+f 0444 root sys $MANDIR/man1/ippeveprinter.1 man/ippeveprinter.1
+f 0444 root sys $MANDIR/man1/ippfind.1 man/ippfind.1
+f 0444 root sys $MANDIR/man1/ipptool.1 man/ipptool.1
+f 0444 root sys $MANDIR/man1/lp.1 man/lp.1
+f 0444 root sys $MANDIR/man1/lpoptions.1 man/lpoptions.1
+f 0444 root sys $MANDIR/man1/lpq.1 man/lpq.1
+f 0444 root sys $MANDIR/man1/lpr.1 man/lpr.1
+f 0444 root sys $MANDIR/man1/lprm.1 man/lprm.1
+f 0444 root sys $MANDIR/man1/lpstat.1 man/lpstat.1
+
+f 0444 root sys $MANDIR/man5/classes.conf.5 man/classes.conf.5
+f 0444 root sys $MANDIR/man5/client.conf.5 man/client.conf.5
+f 0444 root sys $MANDIR/man5/cups-files.conf.5 man/cups-files.conf.5
+f 0444 root sys $MANDIR/man5/cups-snmp.conf.5 man/cups-snmp.conf.5
+f 0444 root sys $MANDIR/man5/cupsd.conf.5 man/cupsd.conf.5
+f 0444 root sys $MANDIR/man5/cupsd-logs.5 man/cupsd-logs.5
+f 0444 root sys $MANDIR/man5/ipptoolfile.5 man/ipptoolfile.5
+f 0444 root sys $MANDIR/man5/mailto.conf.5 man/mailto.conf.5
+f 0444 root sys $MANDIR/man5/mime.convs.5 man/mime.convs.5
+f 0444 root sys $MANDIR/man5/mime.types.5 man/mime.types.5
+f 0444 root sys $MANDIR/man5/printers.conf.5 man/printers.conf.5
+
+f 0444 root sys $MANDIR/man7/ippevepcl.7 man/ippevepcl.7
+l 0644 root sys $MANDIR/man7/ippeveps.7 ippevepcl.7
+
+f 0444 root sys $AMANDIR/man8/cupsaccept.8 man/cupsaccept.8
+l 0644 root sys $AMANDIR/man8/cupsreject.8 cupsaccept.8
+f 0444 root sys $AMANDIR/man8/cupsctl.8 man/cupsctl.8
+f 0444 root sys $AMANDIR/man8/cupsfilter.8 man/cupsfilter.8
+f 0444 root sys $AMANDIR/man8/cups-snmp.8 man/cups-snmp.8
+f 0444 root sys $AMANDIR/man8/cupsd.8 man/cupsd.8
+f 0444 root sys $AMANDIR/man8/cupsd-helper.8 man/cupsd-helper.8
+l 0644 root sys $AMANDIR/man8/cupsdisable.8 cupsenable.8
+f 0444 root sys $AMANDIR/man8/cupsenable.8 man/cupsenable.8
+f 0444 root sys $AMANDIR/man8/lpadmin.8 man/lpadmin.8
+f 0444 root sys $AMANDIR/man8/lpc.8 man/lpc.8
+f 0444 root sys $AMANDIR/man8/lpinfo.8 man/lpinfo.8
+f 0444 root sys $AMANDIR/man8/lpmove.8 man/lpmove.8
 
 %subpackage devel
-f 0444 root sys $MANDIR/man1/cups-config.$MAN1EXT man/cups-config.$MAN1EXT
-f 0444 root sys $MANDIR/man1/ man/ppd*.$MAN1EXT
-f 0444 root sys $MANDIR/man5/ppdcfile.$MAN5EXT man/ppdcfile.$MAN5EXT
-f 0444 root sys $MANDIR/man7/backend.$MAN7EXT man/backend.$MAN7EXT
-f 0444 root sys $MANDIR/man7/filter.$MAN7EXT man/filter.$MAN7EXT
-f 0444 root sys $MANDIR/man7/notifier.$MAN7EXT man/notifier.$MAN7EXT
+f 0444 root sys $MANDIR/man1/cups-config.1 man/cups-config.1
+f 0444 root sys $MANDIR/man1/ man/ppd*.1
+f 0444 root sys $MANDIR/man5/ppdcfile.5 man/ppdcfile.5
+f 0444 root sys $MANDIR/man7/backend.7 man/backend.7
+f 0444 root sys $MANDIR/man7/filter.7 man/filter.7
+f 0444 root sys $MANDIR/man7/notifier.7 man/notifier.7
 
 %subpackage lpd
-d 0755 root sys $AMANDIR/man$MAN8DIR -
-f 0444 root sys $AMANDIR/man$MAN8DIR/cups-lpd.$MAN8EXT man/cups-lpd.$MAN8EXT
+d 0755 root sys $AMANDIR/man8 -
+f 0444 root sys $AMANDIR/man8/cups-lpd.8 man/cups-lpd.8
 %subpackage
 
 # Startup scripts
diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index 62c69e824..9de45b259 100644
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -333,48 +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.gz
-/usr/share/man/man1/cups.1.gz
-/usr/share/man/man1/cupstestppd.1.gz
-/usr/share/man/man1/ippeveprinter.1.gz
+/usr/share/man/man1/cancel.1
+/usr/share/man/man1/cups.1
+/usr/share/man/man1/cupstestppd.1
+/usr/share/man/man1/ippeveprinter.1
 %if %{?_with_dnssd:1}%{!?_with_dnssd:0}
 # DNS-SD
-/usr/share/man/man1/ippfind.1.gz
+/usr/share/man/man1/ippfind.1
 %endif
-/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
+/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
 %dir /usr/share/man/man5
-/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
+/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
 %dir /usr/share/man/man7
-/usr/share/man/man7/ippevepcl.7.gz
-/usr/share/man/man7/ippeveps.7.gz
+/usr/share/man/man7/ippevepcl.7
+/usr/share/man/man7/ippeveps.7
 %dir /usr/share/man/man8
-/usr/share/man/man8/accept.8.gz
-/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
-/usr/share/man/man8/reject.8.gz
+/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
 
 %dir /var/cache/cups
 %attr(0775,root,sys) %dir /var/cache/cups/rss
@@ -393,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.gz
-/usr/share/man/man1/ppd*.1.gz
+/usr/share/man/man1/cups-config.1
+/usr/share/man/man1/ppd*.1
 %dir /usr/share/man/man5
-/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/share/man/man5/ppdcfile.5
+/usr/share/man/man7/backend.7
+/usr/share/man/man7/filter.7
+/usr/share/man/man7/notifier.7
 
 /usr/bin/cups-config
 /usr/bin/ppd*
@@ -437,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.gz
+/usr/share/man/man8/cups-lpd.8