From f97b5ba909febc9b5012420f7fb7d5b63c12524c Mon Sep 17 00:00:00 2001 From: Juan Carlos Luciani Date: Mon, 12 Feb 2007 16:07:25 +0000 Subject: [PATCH] Fixed RPM un-install clean-up issues and modified to no longer delete the users created during RPM install to avoid problems created with files left around that were created by the users. Also removed un-necessary BuildRequire dependency on glade-sharp from CASA_auth_token_server package. --- .../server-java/package/linux/CASA_auth_token_svc.spec.in | 5 ++--- .../server/package/linux/CASA_auth_token_server.spec.in | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in index 2a265f12..98806135 100644 --- a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in +++ b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in @@ -242,6 +242,8 @@ fi %postun # Always undeploy our webapp to force re-deployment on upgrade cases rm -drf /srv/www/casaats/webapps/CasaAuthTokenSvc +rm -drf /srv/www/casaats/work/Catalina +rm -f /srv/www/casaats/conf/server.xml %restart_on_update casa_atsd %insserv_cleanup @@ -251,9 +253,6 @@ if test "$1" == 1; then exit 0 fi -# Delete the casaatsd user -userdel casaatsd - %files %defattr(-,root,root) diff --git a/CASA-auth-token/server/package/linux/CASA_auth_token_server.spec.in b/CASA-auth-token/server/package/linux/CASA_auth_token_server.spec.in index f967888b..86d81042 100644 --- a/CASA-auth-token/server/package/linux/CASA_auth_token_server.spec.in +++ b/CASA-auth-token/server/package/linux/CASA_auth_token_server.spec.in @@ -15,7 +15,7 @@ Name: CASA_auth_token_server %define debug_opt "" URL: http://www.novell.com/products -BuildRequires: CASA-devel apache2-devel expat gcc-c++ glib2-devel libstdc++ libstdc++-devel mono-devel pam-devel pkgconfig update-alternatives java-sdk-1.5.0 sysvinit insserv glade-sharp glade-sharp2 +BuildRequires: CASA-devel apache2-devel expat gcc-c++ glib2-devel libstdc++ libstdc++-devel mono-devel pam-devel pkgconfig update-alternatives java-sdk-1.5.0 sysvinit insserv %ifarch %ix86 BuildRequires: java-1_5_0-ibm-alsa %endif @@ -269,9 +269,6 @@ if test "$1" == 1; then exit 0 fi -# Delete the casaatvd user -userdel casaatvd - # Delete the var files rm -rf /var/lib/CASA/authtoken/validate