Create an RPM

Add an RPM spec file. Make change to configure.ac and Makefiles as
appropriate to facilitate building as an RPM.

Author: tcmitchell

Makefile.am

@@ -1,4 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 SUBDIRS = etc lib portal kmtool sr \
-	  ca openid bin sbin ch man doc templates
+	  openid bin sbin ch man doc templates
+
+AM_DISTCHECK_CONFIGURE_FLAGS = --with-apache-user=apache \
+                               --with-apache-group=apache

bin/Makefile.am

@@ -32,8 +32,15 @@ bin_SCRIPTS = \
 	geni-get-ad-rspecs
 
 if INSTALL_GITHASH
-dist_pkgsysconf_DATA = geni-ch-githash
+pkgsysconf_DATA = geni-ch-githash
 endif
 
+# GPO Lab
+# Install in /usr/local/lib, not /usr/lib
+PYFILES = portal_utils/__init__.py portal_utils/orbit_interface.py
 localpythondir = $(subst /usr/lib,/usr/local/lib,$(pythondir))
-nobase_dist_localpython_DATA = portal_utils/__init__.py portal_utils/orbit_interface.py
+if GPO_LAB
+  nobase_dist_localpython_DATA = $(PYFILES)
+else
+  nobase_dist_python_DATA = $(PYFILES)
+endif

bin/do-make-install.sh

@@ -9,6 +9,6 @@ set -e
 cd ~/proto-ch
 autoreconf --install
 ./configure --prefix=/usr --sysconfdir=/etc --bindir=/usr/local/bin \
-    --sbindir=/usr/local/sbin --mandir=/usr/local/man
+    --sbindir=/usr/local/sbin --mandir=/usr/local/man --enable-gpo-lab
 make
 sudo make install

configure.ac

@@ -42,11 +42,23 @@ fi
 AC_MSG_RESULT($apache_group)
 AC_SUBST(apache_group)
 
+gpolab=yes
+AM_CONDITIONAL(GPO_LAB, [test x"$gpo_lab" = xyes])
+
+AC_ARG_ENABLE([gpo_lab],
+[  --enable-gpo-lab    Turn on GPO Lab modifications],
+[case "${enableval}" in
+  yes) gpo_lab=true ;;
+  no)  gpo_lab=false ;;
+  *) AC_MSG_ERROR([bad value ${enableval} for --enable-gpo-lab]) ;;
+esac],[gpo_lab=false])
+AM_CONDITIONAL([GPO_LAB], [test x$gpo_lab = xtrue])
+
 AM_CONDITIONAL(INSTALL_GITHASH, [test -f bin/geni-ch-githash])
 
 AC_CONFIG_FILES([Makefile etc/Makefile bin/Makefile])
 AC_CONFIG_FILES([sr/Makefile lib/Makefile])
 AC_CONFIG_FILES([kmtool/Makefile portal/Makefile openid/Makefile])
-AC_CONFIG_FILES([ca/Makefile sbin/Makefile ch/Makefile man/Makefile])
+AC_CONFIG_FILES([sbin/Makefile ch/Makefile man/Makefile])
 AC_CONFIG_FILES([doc/Makefile templates/Makefile])
 AC_OUTPUT