[Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.10.2.5, 1.10.2.6

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17822

Modified Files:
      Tag: Directory71RtmBranch
	ldapserver.spec.tmpl 
Log Message:
[170322] setup script hangs without prompting for token password
Specifying the admin server's config file as a config file with %config in
%files section, the files won't be touched unless the upgrade has changes from
the previous version.  With the line, we don't have to do backup/restore the
admin-serv config directory.



Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.10.2.5
retrieving revision 1.10.2.6
diff -u -r1.10.2.5 -r1.10.2.6
--- ldapserver.spec.tmpl	14 Oct 2005 16:07:54 -0000	1.10.2.5
+++ ldapserver.spec.tmpl	14 Oct 2005 17:14:09 -0000	1.10.2.6
@@ -90,6 +90,9 @@
 # files in different places, we won't be able to do this anymore
 %defattr(-,root,root,-)
 %{prefix}
+# don't update admin server configuration files.
+# note: if there's somes change b/w 2 versions, new file is put with .rpmnew
+%config %{prefix}/admin-serv/config/*
 
 %pre
 # in case upgrade, need to shutdown the servers before the installation
@@ -113,24 +116,9 @@
     $RPM_INSTALL_PREFIX/stop-admin
   fi
 fi
-if [ -d $RPM_INSTALL_PREFIX/admin-serv/config ]; then
-  if [ -d $RPM_INSTALL_PREFIX/admin-serv/config.backup ]; then
-    rm -rf $RPM_INSTALL_PREFIX/admin-serv/config.backup
-  fi
-  cp -r $RPM_INSTALL_PREFIX/admin-serv/config $RPM_INSTALL_PREFIX/admin-serv/config.backup
-fi
 
 %post
 echo ""
-if [ -d $RPM_INSTALL_PREFIX/admin-serv/config.backup ]; then
-  if [ -d $RPM_INSTALL_PREFIX/admin-serv/config ]; then
-    if [ -d $RPM_INSTALL_PREFIX/admin-serv/config.generated ]; then
-      rm -rf $RPM_INSTALL_PREFIX/admin-serv/config.generated
-    fi
-    mv $RPM_INSTALL_PREFIX/admin-serv/config $RPM_INSTALL_PREFIX/admin-serv/config.generated
-  fi
-  mv $RPM_INSTALL_PREFIX/admin-serv/config.backup $RPM_INSTALL_PREFIX/admin-serv/config
-fi
 if [ -z "$RPM_INSTALL_PREFIX" ]; then
     RPM_INSTALL_PREFIX=%{prefix}
 fi