Don't install templates as config files anymore.

Do a killall on cupsd between the launchctl commands to avoid
having to do a reboot.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@6480 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/packaging/cups.list.in b/packaging/cups.list.in
index 92ca7afa40fd5a2527e66b66cf92220797345610..de2d5a1cd5d63416eb5b8908ed850c6191860012 100644 (file)
--- a/packaging/cups.list.in
+++ b/packaging/cups.list.in
@@ -434,7 +434,7 @@ d 0755 root sys $DATADIR/model -
 f 0644 root sys $DATADIR/model ppd/*.ppd
 
 d 0755 root sys $DATADIR/templates -
-c 0644 root sys $DATADIR/templates templates/*.tmpl
+f 0644 root sys $DATADIR/templates templates/*.tmpl
 
 # Japanese template files
 %subpackage de
@@ -637,6 +637,8 @@ f 0644 root sys /System/Library/LaunchDaemons/org.cups.cupsd.plist init/org.cups
 %postinstall <<EOF
 rm -f /System/Library/StartupItems/PrintingServices/PrintingServices
 launchctl unload /System/Library/LaunchDaemons/org.cups.cupsd.plist || exit 0
+killall cupsd
+sleep 1
 launchctl load /System/Library/LaunchDaemons/org.cups.cupsd.plist
 EOF
 %subpackage lpd