These set of files has the changes needed to support the new location for the CASA install under the /usr directory.

This commit is contained in:
Cameron (Kamran) Mashayekhi 2006-02-07 21:05:39 +00:00
parent e59741c2ca
commit e6fccaf346
9 changed files with 182 additions and 197 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Feb 7 14:00:59 MST 2006 - cmashayekhi@novell.com
- Updated the CASA.spec to move CASA to /usr/...
- fixed the startup script for updating pam files.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 7 10:49:59 MST 2006 - jnorman@novell.com Tue Feb 7 10:49:59 MST 2006 - jnorman@novell.com
@ -8,6 +14,23 @@ Mon Feb 6 11:52:59 MST 2006 - jnorman@novell.com
- Bug 147801. Fix to add additional key-value pairs - Bug 147801. Fix to add additional key-value pairs
-------------------------------------------------------------------
Mon Feb 6 18:11:08 CET 2006 - meissner@suse.de
- Disable by default #147934
- Do not write PAM entries in micasad startup script #147935
-------------------------------------------------------------------
Mon Jan 30 18:29:05 CET 2006 - ro@suse.de
- replaced java2 by java2-devel-packages in BuildRequires
------------------------------------------------------------------
Fri Jan 27 03:03:18 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 1 9:47:59 MST 2006 - jnorman@novell.com Wed Feb 1 9:47:59 MST 2006 - jnorman@novell.com

View File

@ -1,8 +1,8 @@
[Desktop Entry] [Desktop Entry]
Name=CASA Manager Name=CASA Manager
Comment=Common Authenication Services Adapter Comment=Common Authenication Services Adapter
Exec=/opt/novell/CASA/bin/CASAManager.sh Exec=/usr/bin/CASAManager.sh
Icon=/opt/novell/CASA/images/CASA_48.png Icon=/usr/share/doc/packages/CASA/images/CASA_48.png
Terminal=0 Terminal=0
Type=Application Type=Application
Categories=Application;Network;System Categories=Application;Network;System

View File

@ -7,5 +7,5 @@ ARCH_LIB=
fi fi
export MONO_PATH=/opt/novell/CASA/lib$ARCH_LIB/ export MONO_PATH=/usr/lib$ARCH_LIB/
mono /opt/novell/CASA/bin/CASAManager.exe & mono /usr/bin/CASAManager.exe &

View File

@ -98,7 +98,7 @@ public class Common
INDEX_NATIVEINFO_WALLETLASTACCESSEDTIME = 7; INDEX_NATIVEINFO_WALLETLASTACCESSEDTIME = 7;
public static string LINUX_HELP_PATH = "file:///opt/novell/CASA/help/"; public static string LINUX_HELP_PATH = "file:///usr/share/doc/packages/CASA/help/";
public static string WINDOWS_HELP_PATH = "..\\help\\"; public static string WINDOWS_HELP_PATH = "..\\help\\";
///############################################################## ///##############################################################
@ -112,7 +112,7 @@ public class Common
public static string CASAICONS = "../images/CASAicons.ico"; public static string CASAICONS = "../images/CASAicons.ico";
#endif #endif
#if LINUX #if LINUX
public static string CASAICONS = "/opt/novell/CASA/images/CASAicons.ico"; public static string CASAICONS = "/usr/share/doc/packages/CASA/images/CASAicons.ico";
#endif #endif
///############################################################## ///##############################################################
@ -167,7 +167,7 @@ public class Common
if ( (128 == platform) || (4 == platform) ) if ( (128 == platform) || (4 == platform) )
{ {
IS_LINUX = true; IS_LINUX = true;
GladeFile = "/opt/novell/CASA/images/casa.glade"; GladeFile = "/usr/share/doc/packages/CASA/images/casa.glade";
if( !File.Exists(GladeFile) ) if( !File.Exists(GladeFile) )
{ {

View File

@ -79,7 +79,7 @@ namespace Novell.CASA.GUI
Glade.XML gxmlTemp = new Glade.XML ("../images/casa.glade", "dialogLogin", null); Glade.XML gxmlTemp = new Glade.XML ("../images/casa.glade", "dialogLogin", null);
#endif #endif
#if LINUX #if LINUX
Glade.XML gxmlTemp = new Glade.XML ("/opt/novell/CASA/images/casa.glade", "dialogLogin", null); Glade.XML gxmlTemp = new Glade.XML ("/usr/share/doc/packages/CASA/images/casa.glade", "dialogLogin", null);
#endif #endif
gxmlTemp.Autoconnect (this); gxmlTemp.Autoconnect (this);
//dialogLogin.TransientFor = windowMain; //dialogLogin.TransientFor = windowMain;

View File

@ -11,7 +11,7 @@
# Short-Description: miCASA daemon # Short-Description: miCASA daemon
# Description: miCASA daemon # Description: miCASA daemon
### END INIT INFO ### END INIT INFO
MICASAD_BIN=/opt/novell/CASA/bin/micasad.sh MICASAD_BIN=/usr/bin/micasad.sh
test -x $MICASAD_BIN || exit 5 test -x $MICASAD_BIN || exit 5
. /etc/rc.status . /etc/rc.status
@ -31,24 +31,28 @@ rc_reset
case "$1" in case "$1" in
start) start)
echo -n "Starting miCASA daemon" echo -n "Starting miCASA daemon"
for file in "/etc/pam.d/login" "/etc/pam.d/sshd" "/etc/pam.d/xdm" "/etc/pam.d/gdm" "/etc/pam.d/kdm" for pam_file in "/etc/pam.d/login" "/etc/pam.d/sshd" "/etc/pam.d/xdm" "/etc/pam.d/gdm" "/etc/pam.d/kdm"
do do
if [ -f $name ] if [ -f $pam_file ]
then then
awk ' MICASA_D=`grep -i micasad $pam_file`
/auth/ { authSeen++; } if [ -z "$MICASA_D"]
/account/ { then
if (!acctSeen && authSeen) awk '
{ /auth/ { authSeen++; }
print "auth\trequired\tpam_micasa.so";} /account/ {
acctSeen++; if (!acctSeen && authSeen)
} {
/session/ { sesSeen++; } print "auth\trequired\tpam_micasa.so";}
// {print $0; } acctSeen++;
END { if (sesSeen) }
print "session\trequired\tpam_micasa.so"; } /session/ { sesSeen++; }
' $file > $file.sav // {print $0; }
mv $file.sav $file END { if (sesSeen)
print "session\trequired\tpam_micasa.so"; }
' $pam_file > $pam_file.sav
mv $pam_file.sav $pam_file
fi
fi fi
done done
startproc -f $MICASAD_BIN startproc -f $MICASAD_BIN
@ -61,12 +65,11 @@ case "$1" in
pid=`cat /var/run/micasad.pid` pid=`cat /var/run/micasad.pid`
kill -s TERM $pid kill -s TERM $pid
for file in "/etc/pam.d/login" "/etc/pam.d/sshd" "/etc/pam.d/xdm" "/etc/pam.d/gdm" "/etc/pam.d/kdm" for pam_file in "/etc/pam.d/login" "/etc/pam.d/sshd" "/etc/pam.d/xdm" "/etc/pam.d/gdm" "/etc/pam.d/kdm"
do do
if [ -f $name ] if [ -f $pam_file ]
then then
sed '/pam_micasa/d' $file > $file.sav sed -i '/pam_micasa/d' $pam_file
mv $file.sav $file
fi fi
done done
# Remember status and be verbose # Remember status and be verbose

View File

@ -7,5 +7,5 @@ ARCH_LIB=
fi fi
export MONO_PATH=/opt/novell/CASA/lib$ARCH_LIB/ export MONO_PATH=/usr/lib$ARCH_LIB/
mono /opt/novell/CASA/bin/micasad.exe mono /usr/bin/micasad.exe

View File

@ -81,65 +81,66 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh,int flags,int argc,
/* SSCS determines the client uid using the SO_PEERCRED socket option. /* SSCS determines the client uid using the SO_PEERCRED socket option.
* Hence the euid is temporarily modified to that of the user logging in. * Hence the euid is temporarily modified to that of the user logging in.
*/ */
if(passwdEntry)
{
seteuid( passwdEntry->pw_uid );
do
{
char *error = NULL;
void *ssContext = NULL;
SSCS_SECRETSTORE_T ssId = {0};
seteuid( passwdEntry->pw_uid ); SSCS_SECRET_ID_T secretID = {0};
SSCS_SECRET_ID_T sharedSecretID = {0};
do SSCS_BASIC_CREDENTIAL basicCredential;
{ int credType;
char *error = NULL;
void *ssContext = NULL;
SSCS_SECRETSTORE_T ssId = {0};
SSCS_SECRET_ID_T secretID = {0}; void *nsscsIdkHandle = dlopen(NSSCSIDK_LIB,RTLD_NOW);
SSCS_SECRET_ID_T sharedSecretID = {0}; if( NULL == nsscsIdkHandle )
{
pam_sscs_log(LOG_ERR,"Unable to open %s\n",NSSCSIDK_LIB);
break;
}
SSCS_BASIC_CREDENTIAL basicCredential; pNSSCSSetCredential = dlsym( nsscsIdkHandle,
int credType; "miCASASetCredential");
if( (error = dlerror()) != NULL )
{
pam_sscs_log(LOG_ERR,"Unable to find miCASASetCredential symbol.- %s\n",error);
break;
}
secretID.len = strlen(WORKSTATION_SECRET_ID) + 1;
strcpy(secretID.id,WORKSTATION_SECRET_ID);
sharedSecretID.len = strlen(WORKSTATION_SHARED_SECRET_ID) + 1;
strcpy(sharedSecretID.id,WORKSTATION_SHARED_SECRET_ID);
memset(&basicCredential,0,sizeof(basicCredential));
void *nsscsIdkHandle = dlopen(NSSCSIDK_LIB,RTLD_NOW); if (user && wkstnPasswd)
if( NULL == nsscsIdkHandle ) {
{ basicCredential.unFlags = 0;
pam_sscs_log(LOG_ERR,"Unable to open %s\n",NSSCSIDK_LIB); strcpy(basicCredential.username,user);
break; basicCredential.unLen = strlen(user) + 1;
} strcpy(basicCredential.password,wkstnPasswd);
basicCredential.pwordLen = strlen(wkstnPasswd) + 1;
pNSSCSSetCredential = dlsym( nsscsIdkHandle, retVal = (*pNSSCSSetCredential) (0,&secretID,NULL,
"miCASASetCredential"); SSCS_CRED_TYPE_BASIC_F,
if( (error = dlerror()) != NULL ) &basicCredential,NULL);
{ if( retVal != 0)
pam_sscs_log(LOG_ERR,"Unable to find miCASASetCredential symbol.- %s\n",error); {
break; pam_sscs_log( LOG_ERR,"Setting the default credential failed.Errcode = %d\n",retVal);
} break;
}
secretID.len = strlen(WORKSTATION_SECRET_ID) + 1;
strcpy(secretID.id,WORKSTATION_SECRET_ID);
sharedSecretID.len = strlen(WORKSTATION_SHARED_SECRET_ID) + 1;
strcpy(sharedSecretID.id,WORKSTATION_SHARED_SECRET_ID);
memset(&basicCredential,0,sizeof(basicCredential));
if (user && wkstnPasswd)
{
basicCredential.unFlags = 0;
strcpy(basicCredential.username,user);
basicCredential.unLen = strlen(user) + 1;
strcpy(basicCredential.password,wkstnPasswd);
basicCredential.pwordLen = strlen(wkstnPasswd) + 1;
retVal = (*pNSSCSSetCredential) (0,&secretID,NULL,
SSCS_CRED_TYPE_BASIC_F,
&basicCredential,NULL);
if( retVal != 0)
{
pam_sscs_log( LOG_ERR,"Setting the default credential failed.Errcode = %d\n",retVal);
break;
} }
} }while(0);
}while(0);
seteuid(saved_uid); seteuid(saved_uid);
}
return PAM_SUCCESS; return PAM_SUCCESS;
} }

View File

@ -14,7 +14,8 @@
Name: CASA Name: CASA
#BuildRequires: glade-sharp gnome-filesystem mono mono-core gtk2-devel gtk2 gtk-sharp gtk-sharp-gapi glib-sharp glib2 glib2-devel qt3-devel gcc-c++ kdeutils3 kdelibs3-devel kdelibs3 qt3 qt3-devel kdesdk3 libstdc++-devel pkgconfig gnome-keyring gnome-keyring-devel glib-devel glib pam pam-devel java2 krb5-devel libgssapi #BuildRequires: glade-sharp gnome-filesystem mono mono-core gtk2-devel gtk2 gtk-sharp gtk-sharp-gapi glib-sharp glib2 glib2-devel qt3-devel gcc-c++ kdeutils3 kdelibs3-devel kdelibs3 qt3 qt3-devel kdesdk3 libstdc++-devel pkgconfig gnome-keyring gnome-keyring-devel glib-devel glib pam pam-devel java2 krb5-devel libgssapi
URL: http://www.novell.com/products URL: http://www.novell.com/products
%define prefix /opt/novell %define prefix /usr/share/doc/packages
%define bin_prefix /usr
License: LGPL License: LGPL
Group: Productivity/Other Group: Productivity/Other
Autoreqprov: on Autoreqprov: on
@ -79,98 +80,71 @@ mk-cai-all
mkdir -p %{buildroot}%{prefix} mkdir -p %{buildroot}%{prefix}
mkdir %{buildroot}%{prefix}/CASA mkdir %{buildroot}%{prefix}/CASA
mkdir %{buildroot}%{prefix}/CASA/%{_lib} mkdir %{buildroot}%{bin_prefix}/%{_lib}
mkdir %{buildroot}%{prefix}/CASA/bin mkdir %{buildroot}%{bin_prefix}/bin
mkdir %{buildroot}%{prefix}/CASA/include mkdir %{buildroot}%{bin_prefix}/include
mkdir %{buildroot}%{prefix}/CASA/images mkdir %{buildroot}%{prefix}/CASA/images
mkdir %{buildroot}%{prefix}/CASA/help mkdir %{buildroot}%{prefix}/CASA/help
mkdir %{buildroot}%{prefix}/CASA/help/en mkdir %{buildroot}%{prefix}/CASA/help/en
mkdir %{buildroot}%{prefix}/CASA/doc mkdir %{buildroot}%{prefix}/CASA/doc
mkdir -p %{buildroot}/%{_lib}/security mkdir -p %{buildroot}/%{_lib}/security
install -m 755 %{_lib}/lux/ndbg/libmicasa.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib} install -m 755 %{_lib}/lux/ndbg/libmicasa.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}
install -m 755 %{_lib}/lux/ndbg/libad_gk.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib} install -m 755 %{_lib}/lux/ndbg/libad_gk.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}
install -m 755 %{_lib}/lux/ndbg/libkwallets_rw.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib} install -m 755 %{_lib}/lux/ndbg/libkwallets_rw.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}
install -m 755 %{_lib}/lux/ndbg/libjmicasa.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib} install -m 755 %{_lib}/lux/ndbg/libjmicasa.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}
install -m 755 %{_lib}/lux/ndbg/Novell.CASA.miCASAWrapper.dll %{buildroot}%{prefix}/CASA/%{_lib} install -m 755 %{_lib}/lux/ndbg/Novell.CASA.miCASAWrapper.dll %{buildroot}%{bin_prefix}/%{_lib}
install -m 755 %{_lib}/lux/ndbg/Novell.CASA.Common.dll %{buildroot}%{prefix}/CASA/%{_lib} install -m 755 %{_lib}/lux/ndbg/Novell.CASA.Common.dll %{buildroot}%{bin_prefix}/%{_lib}
install -m 755 %{_lib}/lux/ndbg/Novell.CASA.A-D.dll %{buildroot}%{prefix}/CASA/%{_lib} install -m 755 %{_lib}/lux/ndbg/Novell.CASA.A-D.dll %{buildroot}%{bin_prefix}/%{_lib}
install -m 755 %{_lib}/lux/ndbg/Novell.CASA.CASAPolicy.dll %{buildroot}%{prefix}/CASA/%{_lib} install -m 755 %{_lib}/lux/ndbg/Novell.CASA.CASAPolicy.dll %{buildroot}%{bin_prefix}/%{_lib}
install -m 755 %{_lib}/lux/ndbg/Novell.CASA.DataEngines.GnomeKeyring.dll %{buildroot}%{prefix}/CASA/%{_lib} install -m 755 %{_lib}/lux/ndbg/Novell.CASA.DataEngines.GnomeKeyring.dll %{buildroot}%{bin_prefix}/%{_lib}
install -m 755 %{_lib}/lux/ndbg/Novell.CASA.DataEngines.KWallet.dll %{buildroot}%{prefix}/CASA/%{_lib} install -m 755 %{_lib}/lux/ndbg/Novell.CASA.DataEngines.KWallet.dll %{buildroot}%{bin_prefix}/%{_lib}
install -m 755 %{binsource}/lux/ndbg/micasad.exe %{buildroot}%{prefix}/CASA/bin install -m 755 %{binsource}/lux/ndbg/micasad.exe %{buildroot}%{bin_prefix}/bin
install -m 755 %{binsource}/lux/ndbg/CASAManager.exe %{buildroot}%{prefix}/CASA/bin install -m 755 %{binsource}/lux/ndbg/CASAManager.exe %{buildroot}%{bin_prefix}/bin
install -m 755 c_gui/CASAManager.sh %{buildroot}%{prefix}/CASA/bin install -m 755 c_gui/CASAManager.sh %{buildroot}%{bin_prefix}/bin
install -m 755 c_gui/CASAManager.exe.config %{buildroot}%{prefix}/CASA/bin install -m 755 c_gui/CASAManager.exe.config %{buildroot}%{bin_prefix}/bin
install -m 755 c_gui/CASAManager.desktop %{buildroot}%{prefix}/CASA/ install -m 755 c_gui/CASAManager.desktop %{buildroot}%{prefix}/CASA/
install -m 755 c_gui/images/* %{buildroot}%{prefix}/CASA/images install -m 755 c_gui/images/* %{buildroot}%{prefix}/CASA/images
install -m 755 c_gui/help/en/* %{buildroot}%{prefix}/CASA/help/en install -m 755 c_gui/help/en/* %{buildroot}%{prefix}/CASA/help/en
install -m 755 c_micasad/startup/micasad %{buildroot}%{prefix}/CASA/bin install -m 755 c_micasad/startup/micasad %{buildroot}%{bin_prefix}/bin
install -m 755 c_micasad/startup/micasad.sh %{buildroot}%{prefix}/CASA/bin install -m 755 c_micasad/startup/micasad.sh %{buildroot}%{bin_prefix}/bin
install -m 755 %{_lib}/lux/ndbg/pam_micasa.so %{buildroot}/%{_lib}/security install -m 755 %{_lib}/lux/ndbg/pam_micasa.so %{buildroot}/%{_lib}/security
install -d %{buildroot}%{prefix}/%{_lib} install -d %{buildroot}%{bin_prefix}/%{_lib}
install -d %{buildroot}%{prefix}/bin install -d %{buildroot}%{bin_prefix}/bin
install -d %{buildroot}%{prefix}/include install -d %{buildroot}%{bin_prefix}/include
install -d %{buildroot}%{prefix}/CASA/%{_lib}
install -d %{buildroot}%{prefix}/CASA/bin
install -d %{buildroot}%{prefix}/CASA/doc install -d %{buildroot}%{prefix}/CASA/doc
install -d %{buildroot}%{prefix}/CASA/include
install -d %{buildroot}%{prefix}/CASA/images install -d %{buildroot}%{prefix}/CASA/images
install -d %{buildroot}%{prefix}/CASA/help/en install -d %{buildroot}%{prefix}/CASA/help/en
install -d %{buildroot}/%{_lib}/security install -d %{buildroot}/%{_lib}/security
#install -m 644 %{buildroot}%{prefix}/%{_lib}/miCASA.jar %{buildroot}%{prefix}/CASA/%{_lib} #install -m 644 %{buildroot}%{prefix}/%{_lib}/miCASA.jar %{buildroot}%{prefix}/CASA/%{_lib}
install -m 644 doc/CASA_Reference_Guide.pdf %{buildroot}%{prefix}/CASA/doc install -m 644 doc/CASA_Reference_Guide.pdf %{buildroot}%{prefix}/CASA/doc
install -m 644 doc/License.txt %{buildroot}%{prefix}/CASA/doc install -m 644 doc/License.txt %{buildroot}%{prefix}/CASA/doc
install -m 644 doc/Readme.txt %{buildroot}%{prefix}/CASA/doc install -m 644 doc/Readme.txt %{buildroot}%{prefix}/CASA/doc
install -m 644 include/micasa_mgmd.h %{buildroot}%{prefix}/CASA/include install -m 644 include/micasa_mgmd.h %{buildroot}%{bin_prefix}/include
install -m 644 include/* %{buildroot}%{prefix}/CASA/include install -m 644 include/micasa_types.h %{buildroot}%{bin_prefix}/include
install -m 644 include/micasa.h %{buildroot}%{bin_prefix}/include
ln -s libmicasa.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libmicasa.so
ln -s libmicasa.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libmicasa.so.1
ln -s libjmicasa.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libjmicasa.so
ln -s libjmicasa.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libjmicasa.so.1
#ln -s miCASA.jar %{buildroot}%{bin_prefix}/CASA/%{_lib}/jmiCASA.jar
ln -s ../CASA/bin/micasad.exe %{buildroot}%{prefix}/bin/micasad.exe ln -s libkwallets_rw.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libkwallets_rw.so
ln -s ../CASA/bin/micasad.sh %{buildroot}%{prefix}/bin/micasad.sh ln -s libkwallets_rw.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libkwallets_rw.so.1
ln -s ../CASA/bin/micasad %{buildroot}%{prefix}/bin/micasad
ln -s libmicasa.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libmicasa.so ln -s libad_gk.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libad_gk.so
ln -s libmicasa.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libmicasa.so.1 ln -s libad_gk.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libad_gk.so.1
ln -s libjmicasa.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libjmicasa.so
ln -s libjmicasa.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libjmicasa.so.1
#ln -s miCASA.jar %{buildroot}%{prefix}/CASA/%{_lib}/jmiCASA.jar
ln -s ../CASA/%{_lib}/libmicasa.so %{buildroot}%{prefix}/%{_lib}/libmicasa.so
ln -s ../CASA/%{_lib}/libmicasa.so.1 %{buildroot}%{prefix}/%{_lib}/libmicasa.so.1
ln -s ../CASA/%{_lib}/libjmicasa.so %{buildroot}%{prefix}/%{_lib}/libjmicasa.so
ln -s ../CASA/%{_lib}/libjmicasa.so.1 %{buildroot}%{prefix}/%{_lib}/libjmicasa.so.1
#ln -s ../CASA/%{_lib}/miCASA.jar %{buildroot}%{prefix}/%{_lib}/jmiCASA.jar
ln -s ../CASA/%{_lib}/Novell.CASA.miCASAWrapper.dll %{buildroot}%{prefix}/%{_lib}/Novell.CASA.miCASAWrapper.dll
ln -s ../CASA/%{_lib}/Novell.CASA.Common.dll %{buildroot}%{prefix}/%{_lib}/Novell.CASA.Common.dll
ln -s ../CASA/%{_lib}/Novell.CASA.CASAPolicy.dll %{buildroot}%{prefix}/%{_lib}/Novell.CASA.CASAPolicy.dll
ln -s ../CASA/%{_lib}/Novell.CASA.A-D.dll %{buildroot}%{prefix}/%{_lib}/Novell.CASA.A-D.dll
ln -s ../CASA/%{_lib}/Novell.CASA.DataEngines.GnomeKeyring.dll %{buildroot}%{prefix}/%{_lib}/Novell.CASA.DataEngines.GnomeKeyring.dll
ln -s ../CASA/%{_lib}/Novell.CASA.DataEngines.KWallet.dll %{buildroot}%{prefix}/%{_lib}/Novell.CASA.DataEngines.KWallet.dll
ln -s libkwallets_rw.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libkwallets_rw.so
ln -s libkwallets_rw.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libkwallets_rw.so.1
ln -s ../CASA/%{_lib}/libkwallets_rw.so %{buildroot}%{prefix}/%{_lib}/libkwallets_rw.so
ln -s ../CASA/%{_lib}/libkwallets_rw.so.1 %{buildroot}%{prefix}/%{_lib}/libkwallets_rw.so.1
ln -s libad_gk.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libad_gk.so
ln -s libad_gk.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libad_gk.so.1
ln -s ../CASA/%{_lib}/libad_gk.so %{buildroot}%{prefix}/%{_lib}/libad_gk.so
ln -s ../CASA/%{_lib}/libad_gk.so.1 %{buildroot}%{prefix}/%{_lib}/libad_gk.so.1
ln -s ../CASA/include/micasa.h %{buildroot}%{prefix}/include/micasa.h
ln -s ../CASA/include/micasa_mgmd.h %{buildroot}%{prefix}/include/micasa_mgmd.h
mkdir -p %{buildroot}/etc/init.d mkdir -p %{buildroot}/etc/init.d
mkdir -p %{buildroot}/etc/ld.so.conf.d mkdir -p %{buildroot}/etc/ld.so.conf.d
cp %{buildroot}%{prefix}/CASA/bin/micasad %{buildroot}/etc/init.d cp %{buildroot}%{bin_prefix}/bin/micasad %{buildroot}/etc/init.d
echo "/opt/novell/CASA/%{_lib}/" >> %{buildroot}/etc/ld.so.conf.d/CASA.conf echo "/usr/%{_lib}/" >> %{buildroot}/etc/ld.so.conf.d/CASA.conf
%post %post
@ -201,40 +175,34 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root) %defattr(-,root,root)
%dir %{prefix} %dir %{prefix}
%dir %{prefix}/CASA %dir %{prefix}/CASA
%dir %{prefix}/%{_lib} %dir %{bin_prefix}/%{_lib}
%dir %{prefix}/CASA/%{_lib}
%dir %{prefix}/CASA/doc %dir %{prefix}/CASA/doc
%dir %{prefix}/CASA/%{_lib}/libmicasa.so.%{bldno} %dir %{bin_prefix}/%{_lib}/libmicasa.so.%{bldno}
%dir %{prefix}/CASA/%{_lib}/libmicasa.so %dir %{bin_prefix}/%{_lib}/libmicasa.so
%dir %{prefix}/CASA/%{_lib}/libmicasa.so.1 %dir %{bin_prefix}/%{_lib}/libmicasa.so.1
%dir %{prefix}/CASA/%{_lib}/libjmicasa.so.%{bldno} %dir %{bin_prefix}/%{_lib}/libjmicasa.so.%{bldno}
%dir %{prefix}/CASA/%{_lib}/libjmicasa.so %dir %{bin_prefix}/%{_lib}/libjmicasa.so
%dir %{prefix}/CASA/%{_lib}/libjmicasa.so.1 %dir %{bin_prefix}/%{_lib}/libjmicasa.so.1
%dir %{prefix}/CASA/%{_lib}/Novell.CASA.miCASAWrapper.dll %dir %{bin_prefix}/%{_lib}/Novell.CASA.miCASAWrapper.dll
%dir %{prefix}/CASA/%{_lib}/Novell.CASA.Common.dll %dir %{bin_prefix}/%{_lib}/Novell.CASA.Common.dll
%dir %{prefix}/%{_lib}/libmicasa.so %dir %{bin_prefix}/%{_lib}/libmicasa.so
%dir %{prefix}/%{_lib}/libmicasa.so.1 %dir %{bin_prefix}/%{_lib}/libmicasa.so.1
%dir %{prefix}/%{_lib}/libjmicasa.so %dir %{bin_prefix}/%{_lib}/libjmicasa.so
%dir %{prefix}/%{_lib}/libjmicasa.so.1 %dir %{bin_prefix}/%{_lib}/libjmicasa.so.1
%dir %{prefix}/%{_lib}/Novell.CASA.miCASAWrapper.dll %dir %{bin_prefix}/%{_lib}/Novell.CASA.miCASAWrapper.dll
%dir %{prefix}/%{_lib}/Novell.CASA.Common.dll %dir %{bin_prefix}/%{_lib}/Novell.CASA.Common.dll
%dir %{prefix}/bin %dir %{bin_prefix}/bin
%dir %{prefix}/CASA/bin %{bin_prefix}/bin/micasad
%{prefix}/CASA/bin/micasad %{bin_prefix}/bin/micasad.sh
%{prefix}/CASA/bin/micasad.sh %{bin_prefix}/bin/micasad.exe
%{prefix}/CASA/bin/micasad.exe
%{prefix}/CASA/doc/CASA_Reference_Guide.pdf %{prefix}/CASA/doc/CASA_Reference_Guide.pdf
%{prefix}/CASA/doc/License.txt %{prefix}/CASA/doc/License.txt
%{prefix}/CASA/doc/Readme.txt %{prefix}/CASA/doc/Readme.txt
%{prefix}/bin/micasad
%{prefix}/bin/micasad.sh
%{prefix}/bin/micasad.exe
/etc/init.d/micasad /etc/init.d/micasad
/%{_lib}/security/pam_micasa.so /%{_lib}/security/pam_micasa.so
@ -242,39 +210,29 @@ rm -rf $RPM_BUILD_ROOT
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{prefix}/include %{bin_prefix}/include
%{prefix}/CASA/include
%files gui %files gui
%defattr(-,root,root) %defattr(-,root,root)
%dir %{prefix}/CASA/bin/ %dir %{bin_prefix}/bin/
%{prefix}/CASA/bin/CASAManager.sh %{bin_prefix}/bin/CASAManager.sh
%{prefix}/CASA/bin/CASAManager.exe.config %{bin_prefix}/bin/CASAManager.exe.config
%{prefix}/CASA/bin/CASAManager.exe %{bin_prefix}/bin/CASAManager.exe
%{prefix}/CASA/CASAManager.desktop %{prefix}/CASA/CASAManager.desktop
%dir %{prefix}/CASA/%{_lib}/ %dir %{bin_prefix}/%{_lib}/
%{prefix}/CASA/%{_lib}/libad_gk.so.%{bldno} %{bin_prefix}/%{_lib}/libad_gk.so.%{bldno}
%{prefix}/CASA/%{_lib}/libad_gk.so %{bin_prefix}/%{_lib}/libad_gk.so
%{prefix}/CASA/%{_lib}/libad_gk.so.1 %{bin_prefix}/%{_lib}/libad_gk.so.1
%{prefix}/CASA/%{_lib}/libkwallets_rw.so.%{bldno} %{bin_prefix}/%{_lib}/libkwallets_rw.so.%{bldno}
%{prefix}/CASA/%{_lib}/libkwallets_rw.so %{bin_prefix}/%{_lib}/libkwallets_rw.so
%{prefix}/CASA/%{_lib}/libkwallets_rw.so.1 %{bin_prefix}/%{_lib}/libkwallets_rw.so.1
%{prefix}/CASA/%{_lib}/Novell.CASA.A-D.dll %{bin_prefix}/%{_lib}/Novell.CASA.A-D.dll
%{prefix}/CASA/%{_lib}/Novell.CASA.CASAPolicy.dll %{bin_prefix}/%{_lib}/Novell.CASA.CASAPolicy.dll
%{prefix}/CASA/%{_lib}/Novell.CASA.DataEngines.GnomeKeyring.dll %{bin_prefix}/%{_lib}/Novell.CASA.DataEngines.GnomeKeyring.dll
%{prefix}/CASA/%{_lib}/Novell.CASA.DataEngines.KWallet.dll %{bin_prefix}/%{_lib}/Novell.CASA.DataEngines.KWallet.dll
%{prefix}/%{_lib}/libad_gk.so
%{prefix}/%{_lib}/libad_gk.so.1
%{prefix}/%{_lib}/libkwallets_rw.so
%{prefix}/%{_lib}/libkwallets_rw.so.1
%{prefix}/%{_lib}/Novell.CASA.A-D.dll
%{prefix}/%{_lib}/Novell.CASA.CASAPolicy.dll
%{prefix}/%{_lib}/Novell.CASA.DataEngines.GnomeKeyring.dll
%{prefix}/%{_lib}/Novell.CASA.DataEngines.KWallet.dll
%dir %{prefix}/CASA/images %dir %{prefix}/CASA/images
%{prefix}/CASA/images/* %{prefix}/CASA/images/*