Index: build =================================================================== RCS file: /cvs/cvsnt/redhat/build,v retrieving revision 1.1.2.5.4.15.2.3 diff -c -r1.1.2.5.4.15.2.3 build *** build 3 Dec 2016 03:28:04 -0000 1.1.2.5.4.15.2.3 --- build 12 Dec 2016 05:12:37 -0000 *************** *** 15,21 **** # chmod 400 id_dsa # scp authorized_keys2 acer64debian:~/.ssh/ # ! MYHOST=acer64debian if [ "x$1" == "xfull" -o "x$1" == "xlicense.full" ]; then LICENSEFILE=license.full else --- 15,46 ---- # chmod 400 id_dsa # scp authorized_keys2 acer64debian:~/.ssh/ # ! ! ! # ! # If my IP address is like 10.10.10.109 or 10.0.1.167 then I'm running on ! # the March hare corporate network, probably on VMware. Otherwise I'm ! # probably running on a VMWare fusion instance on a laptop somewhere in ! # the big wide world... ! # ! #MYIPADDR=`hostname -I` ! MYIPADDR=10 ! if [ -x /usr/sbin/ip ]; then ! MYIPADDR=$(ip -o addr show up primary scope global | while read -r num dev fam addr rest; do echo ${addr%/*} | cut -d '.' -f 1; done) ! else ! if [ -x /sbin/ifconfig ]; then ! MYIPADDR=$(/sbin/ifconfig | grep -e "inet." -e "addr." | grep -v "inet6" | grep -v "HWaddr" | grep -v "127.0.0.1" | head -n 1 | awk '{print $2}' | cut -d '.' -f 1 | sed 's/addr.//g') ! fi ! fi ! ! if [ "x$MYIPADDR" == "x10" ]; then ! MYHOST=acer64debian ! MYNETTIME=10.0.1.168 ! else ! MYHOST="-P 8227 abarrett@mail.march-hare.com" ! MYNETTIME=au.pool.ntp.org ! fi ! if [ "x$1" == "xfull" -o "x$1" == "xlicense.full" ]; then LICENSEFILE=license.full else *************** *** 32,40 **** # Set the current date/time #echo "Enter the root password so I can sync the local clock" > /dev/stderr ! #sudo /usr/sbin/ntpdate au.pool.ntp.org ! #/usr/sbin/ntpdate au.pool.ntp.org ! sudo /usr/sbin/ntpdate 10.0.1.168 echo "If prompted enter the password for $MYHOST so I can get the file 'release'" > /dev/stderr scp $MYHOST:cvs/release . --- 57,63 ---- # Set the current date/time #echo "Enter the root password so I can sync the local clock" > /dev/stderr ! sudo /usr/sbin/ntpdate $MYNETTIME echo "If prompted enter the password for $MYHOST so I can get the file 'release'" > /dev/stderr scp $MYHOST:cvs/release . *************** *** 98,104 **** fi if [ "x$REDHATVER" == "x6" -o "x$REDHATVER" == "x61" -o "x$REDHATVER" == "x62" -o "x$REDHATVER" == "x63" -o "x$REDHATVER" == "x64" -o "x$REDHATVER" == "x65" -o "x$REDHATVER" == "x66" -o "x$REDHATVER" == "x67" -o "x$REDHATVER" == "x68" ]; then REDHATDIST="rhel6" ! sed "s/@LICENSEFILE@/$LICENSEFILE/" cvsnt.spec.tmp2 sed "s/cvsnt-pam/cvsnt-pam-5/" cvsnt.spec.tmp3 sed "s/rh9/$REDHATDIST/" cvsnt.spec.tmp4 sed 's/LDFLAGS="-L\/usr\/kerberos\/lib"/LDFLAGS="-L\/usr\/kerberos\/lib\/" SSL_LIBS="-L\/usr\/kerberos\/lib\/ -lssl -lcrypto"/' cvsnt.spec --- 121,140 ---- fi if [ "x$REDHATVER" == "x6" -o "x$REDHATVER" == "x61" -o "x$REDHATVER" == "x62" -o "x$REDHATVER" == "x63" -o "x$REDHATVER" == "x64" -o "x$REDHATVER" == "x65" -o "x$REDHATVER" == "x66" -o "x$REDHATVER" == "x67" -o "x$REDHATVER" == "x68" ]; then REDHATDIST="rhel6" ! sed 's:echo "Using %{_mandir}/cvs.1":mv man/cvs.1 cvsnt.1; echo "Using %{_mandir}/cvsnt.1":' cvsnt.spec.tmp0 ! sed 's:echo "Using %{_mandir}/cvs.5":mv man/cvs.5 cvsnt.5; echo "Using %{_mandir}/cvsnt.5":' cvsnt.spec.tmp00 ! sed 's:echo "Starting make:sed "s/cvs.1/cvsnt.1/g" < man/Makefile > man/Makefile.tmp2; sed "s/cvs.5/cvsnt.5/g" < man/Makefile.tmp2 > man/Makefile; echo "Starting make:' cvsnt.spec.tmp01 ! sed 's:install cvs .RPM_BUILD_ROOT:mv cvs cvsproxy; install cvsproxy \$RPM_BUILD_ROOT; ln -sf $RPM_BUILD_ROOT/%{_bindir}/cvsproxy $RPM_BUILD_ROOT/%{_bindir}/cvs:' cvsnt.spec.tmp02 ! sed "s:gzip $RPM_BUILD_ROOT%{_mandir}/man1:ln -sf $RPM_BUILD_ROOT%{_mandir}/man1/cvsnt.1 cvs.1;gzip $RPM_BUILD_ROOT%{_mandir}/man1:' cvsnt.spec.tmp03 ! sed "s:gzip $RPM_BUILD_ROOT%{_mandir}/man5:ln -sf $RPM_BUILD_ROOT%{_mandir}/man5/cvsnt.5 cvs.5;gzip $RPM_BUILD_ROOT%{_mandir}/man5:' cvsnt.spec.tmp1 ! sed "s/@LICENSEFILE@/$LICENSEFILE/" cvsnt.spec.tmp2 ! sed "s/cvsnt-pam/cvsnt-pam-5/" cvsnt.spec.tmp3 ! sed "s/rh9/$REDHATDIST/" cvsnt.spec.tmp4 ! sed 's/LDFLAGS="-L\/usr\/kerberos\/lib"/LDFLAGS="-L\/usr\/kerberos\/lib\/" SSL_LIBS="-L\/usr\/kerberos\/lib\/ -lssl -lcrypto"/' cvsnt.spec ! fi ! if [ "x$REDHATVER" == "x70" -o "x$REDHATVER" == "x71" -o "x$REDHATVER" == "x72" -o "x$REDHATVER" == "x73" ]; then ! REDHATDIST="rhel6" ! sed "s/@LICENSEFILE@/$LICENSEFILE/" cvsnt.spec.tmp2 sed "s/cvsnt-pam/cvsnt-pam-5/" cvsnt.spec.tmp3 sed "s/rh9/$REDHATDIST/" cvsnt.spec.tmp4 sed 's/LDFLAGS="-L\/usr\/kerberos\/lib"/LDFLAGS="-L\/usr\/kerberos\/lib\/" SSL_LIBS="-L\/usr\/kerberos\/lib\/ -lssl -lcrypto"/' cvsnt.spec Index: cvsnt.spec.in =================================================================== RCS file: /cvs/cvsnt/redhat/cvsnt.spec.in,v retrieving revision 1.5.2.29.6.27.2.6 diff -c -r1.5.2.29.6.27.2.6 cvsnt.spec.in *** cvsnt.spec.in 7 Sep 2015 22:24:40 -0000 1.5.2.29.6.27.2.6 --- cvsnt.spec.in 12 Dec 2016 04:28:44 -0000 *************** *** 204,209 **** --- 204,212 ---- %setup -q %build + echo "Using %{_mandir}/cvs.1" + echo "Using %{_mandir}/cvs.5" + echo "Starting make!" %configure --mandir=%{_mandir} --disable-postgres \ CFLAGS="-I/usr/kerberos/include" \ CXXFLAGS="-I/usr/kerberos/include" \