[Gsrc-commit] /srv/bzr/gsrc/trunk r1101: add some extra info to gnubatch and gnuspool files

[Brandon Invergo]

------------------------------------------------------------
revno: 1101
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sat 2012-11-10 16:38:59 +0100
message:
  add some extra info to gnubatch and gnuspool files
modified:
  gnu/gnuspool/Makefile
  gnu/gnuspool/config.mk

=== modified file 'gnu/gnuspool/Makefile'
--- a/gnu/gnuspool/Makefile     2012-11-10 11:31:41 +0000
+++ b/gnu/gnuspool/Makefile     2012-11-10 15:38:59 +0000
@@ -19,20 +19,23 @@
 include ../../gar.lib/auto.mk
 include config.mk
 
+CONFIGURE_ARGS += SPOOLUSER=$(SPOOLUSER)
+BUILD_ARGS += SPOOLUSER=$(SPOOLUSER)
 INSTALL_ARGS += CFLAGS="-I$(prefix)/include \
                          -I$(prefix)/include/gtk-2.0" \
-               STAGED_INSTALL=true
+               STAGED_INSTALL=true \
+               SPOOLUSER=$(SPOOLUSER)
 
 post-build:
-       sed -i -e 's/-o root/-o $(SPOOLUSER)/g' $(WORKSRC)/build/Makefile
+       sed -i -e 's/-o root/-o $(ROOTUSER)/g' $(WORKSRC)/build/Makefile
        sed -i -e 's/-g root/-g $(ROOTGROUP)/g' $(WORKSRC)/build/Makefile
        sed -i -e 's/-g tty/-g $(TTYGROUP)/g' $(WORKSRC)/build/Makefile
        sed -i -e 's/-g root/-g $(ROOTGROUP)/g' $(WORKSRC)/build/loccgi/Makefile
        sed -i -e 's/-g root/-g $(ROOTGROUP)/g' $(WORKSRC)/build/ins/Makefile
-       sed -i -e 's/-o root/-o $(SPOOLUSER)/g' $(WORKSRC)/build/remcgi/Makefile
+       sed -i -e 's/-o root/-o $(ROOTUSER)/g' $(WORKSRC)/build/remcgi/Makefile
        sed -i -e 's/-g root/-g $(ROOTGROUP)/g' $(WORKSRC)/build/remcgi/Makefile
        sed -i -e 's/-g root/-g $(ROOTGROUP)/g' 
$(WORKSRC)/build/termserv/Makefile
-       sed -i -e 's/-o root/-o $(SPOOLUSER)/g' 
$(WORKSRC)/build/termserv/Makefile
+       sed -i -e 's/-o root/-o $(ROOTUSER)/g' 
$(WORKSRC)/build/termserv/Makefile
        sed -i -e 's/-g root/-g $(ROOTGROUP)/g' $(WORKSRC)/build/lpdint/Makefile
-       sed -i -e 's/-o root/-o $(SPOOLUSER)/g' $(WORKSRC)/build/lpdint/Makefile
+       sed -i -e 's/-o root/-o $(ROOTUSER)/g' $(WORKSRC)/build/lpdint/Makefile
        $(MAKECOOKIE)

=== modified file 'gnu/gnuspool/config.mk'
--- a/gnu/gnuspool/config.mk    2012-11-10 11:31:41 +0000
+++ b/gnu/gnuspool/config.mk    2012-11-10 15:38:59 +0000
@@ -1,13 +1,23 @@
 ## Configuration options for gnuspool ##
 
-# gnuspool requires that you set a spool user (default gnuspool)
+## Note, gnuspool was designed to be installed and used in a system-wide 
manner.
+## Several files are given particular permissions. It is expected that unless 
+## you use the default settings, the software will probably not function as 
+## expected. As a result, to properly build and use this software via GSRC, you
+## will likely need root priveledges.
+
+CONFIGURE_OPTS ?= --without-x --with-spool-directory=$(prefix)/var/gspool 
+BUILD_OPTS ?=
+
+# gnuspool requires that you set a spool user (default gnuspool). Only changes 
in
+# this variable are supported
 SPOOLUSER=gnuspool
-# some files are normally installed to the root group. You can change that here
-ROOTGROUP=$(SPOOLUSER)
-# same for the tty group
-TTYGROUP=$(SPOOLUSER)
+# Many files are placed under ownership of the 'root' user/group. You may give 
them
+# a different group here. 
+ROOTUSER=root
+ROOTGROUP=root
+# Some files are assigned to the 'tty' group. You may change that here
+TTYGROUP=tty
 
-CONFIGURE_OPTS ?= --without-x --with-spool-directory=$(prefix)/var/gspool 
SPOOLUSER=$(SPOOLUSER)
-BUILD_OPTS ?=