Explorar o código

need to patch the console in both upgrade installation and regular installation

Rich Megginson %!s(int64=20) %!d(string=hai) anos
pai
achega
9dd5217def
Modificáronse 1 ficheiros con 4 adicións e 4 borrados
  1. 4 4
      ldapserver.spec.tmpl

+ 4 - 4
ldapserver.spec.tmpl

@@ -122,6 +122,10 @@ echo ""
 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 [ "$1" -ge 1 ] ; then
     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