[Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.20, 1.21

Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18524 Modified Files: ldapserver.spec.tmpl Log Message: need to patch the console in both upgrade installation and regular installation Index: ldapserver.spec.tmpl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ldapserver.spec.tmpl 8 Dec 2005 01:14:17 -0000 1.20 +++ ldapserver.spec.tmpl 8 Dec 2005 03:59:02 -0000 1.21 @@ -122,6 +122,10 @@ if [ -z "$RPM_INSTALL_PREFIX" ]; then RPM_INSTALL_PREFIX=%{prefix} fi +# patch file to fix startconsole ld libpath +if [ -f $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch ] ; then + patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch +fi if [ "$1" -ge 1 ] ; then # patch file to upgrade admin server from 1.0 to 1.0.1 if [ -f $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch ] ; then @@ -131,10 +135,6 @@ if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch ] ; then patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch fi -# patch file to fix startconsole ld libpath - if [ -f $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch ] ; then - patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch - fi # fix up file permissions testfile=$RPM_INSTALL_PREFIX/admin-serv/config/nss.conf if [ ! -f $testfile ] ; then