Upgrade to evince-3.14.1

[hvlinux.git] / stage5 / pkg / cups

diff --git a/stage5/pkg/cups b/stage5/pkg/cups
index c65a6da..41da956 100644 (file)
--- a/stage5/pkg/cups
+++ b/stage5/pkg/cups
@@ -2,12 +2,19 @@
 
 hvconfig_pre()
 {
-    hv_useradd -c "Print_Service_User" -d /dev/null -g lp -s /bin/false -u 9 lp
+    hv_useradd --system -c "Print_Service_User" -d /dev/null -g lp \
+               -s /bin/false lp
 
-    CONFIGURE_OPTS="--libdir=/usr/lib"
+    groupadd --system -f lpadmin
+
+    CONFIGURE_OPTS=" \
+        --libdir=/usr/lib \
+        --disable-systemd \
+        --with-rcdir=/tmp/cupsinit \
+        --with-system-groups=lpadmin"
 }
 
-hvbuild_pre()
+hvbuild_post()
 {
     if [ -n "${CUPS_SERVER}" ]; then
         # Configuring for connection to a remote CUPS print server