diff --git a/CASA-auth-token/non-java/package/linux/CASA_auth_token_native.changes b/CASA-auth-token/non-java/package/linux/CASA_auth_token_native.changes index 276cc295..a0264268 100644 --- a/CASA-auth-token/non-java/package/linux/CASA_auth_token_native.changes +++ b/CASA-auth-token/non-java/package/linux/CASA_auth_token_native.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 2 11:47:16 MDT 2006 - jluciani@novell.com + +- Made spec file modifications suggested by SuSE. The changes entailed + leveraging RPM macros instead of using my own scripts to make the + RPM more solid. + ------------------------------------------------------------------- Thu Sep 14 17:41:40 MDT 2006 - jluciani@novell.com diff --git a/CASA-auth-token/non-java/package/linux/CASA_auth_token_native.spec.in b/CASA-auth-token/non-java/package/linux/CASA_auth_token_native.spec.in index 7d33d5eb..d43a8e09 100644 --- a/CASA-auth-token/non-java/package/linux/CASA_auth_token_native.spec.in +++ b/CASA-auth-token/non-java/package/linux/CASA_auth_token_native.spec.in @@ -154,6 +154,7 @@ export NO_BRP_CHECK_BYTECODE_VERSION="true" ## Prime the file system ## install -d %{buildroot}%{prefix} install -d %{buildroot}%{prefix}/bin +install -d %{buildroot}%{prefix}/sbin install -d %{buildroot}%{prefix}/%{_lib} install -d %{buildroot}/%{_lib}/security install -d %{buildroot}%{prefix}/include @@ -192,6 +193,8 @@ install -m 755 bin/%{cfg}/CasaAuthtokenValidateD %{buildroot}%{prefix}/bin/casa_ # Others install -m 644 server/AuthTokenValidate/idenTokenProviders/casa/linux/CasaIdentityToken.conf %{buildroot}/etc/CASA/authtoken.d/modules.d/CasaIdentityToken.conf install -m 755 server/AuthTokenValidate/Svc/linux/CasaAuthtokenValidateD %{buildroot}/etc/init.d/casa_atvd +install -m 750 server/AuthTokenValidate/Svc/linux/envvars %{buildroot}/etc/CASA/authtoken.d/validate.d/ +ln -sf casa_atvd %{buildroot}%{prefix}/sbin/rccasa_atvd ## CASA_auth_token_pam_support ## # Libs @@ -235,106 +238,28 @@ fi %post /sbin/ldconfig -CAVD_ETC_DIR=/etc/CASA/authtoken.d/validate.d - -setup_casa_atvd_env() -{ - # Save copy of enviroments file if it already exists - if [ -f $CAVD_ETC_DIR/envvars ]; then - mv $CAVD_ETC_DIR/envvars $CAVD_ETC_DIR/envvars.bak - fi - - # Create envvars file - cat > $CAVD_ETC_DIR/envvars <