sync up CASA_dbg.spec with CASA.spec

shsrc/lshsrc/CASA_dbg.spec

@@ -21,12 +21,12 @@ License:       LGPL
 Group:         Productivity/Other
 Autoreqprov:   on
 %define	       bldno	1.1.1
-Version:       1.6.000
+Version:       1.6.0
 Release:       0
 Summary:       Novell Common Authentication Service Adapter (CASA)
 Source:        %{name}-%{version}.tar.bz2
 #Patch:	       %{name}-%{version}.dif
-Patch2:		   CASA-detect_lib64.patch
+Patch2:        CASA-detect_lib64.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 Requires:      mono >= 1.1.13 mono-core >= 1.1.13 
 PreReq:        %fillup_prereq %insserv_prereq
@@ -82,15 +82,18 @@ mk-cai-all
 %install
 
 mkdir -p %{buildroot}%{prefix}
-mkdir %{buildroot}%{prefix}/CASA
+mkdir -p %{buildroot}%{prefix}/CASA
-mkdir %{buildroot}%{bin_prefix}/%{_lib}
+mkdir -p %{buildroot}%{bin_prefix}/%{_lib}
-mkdir %{buildroot}%{bin_prefix}/bin
+mkdir -p %{buildroot}%{bin_prefix}/bin
-mkdir %{buildroot}%{bin_prefix}/include
+mkdir -p %{buildroot}%{bin_prefix}/sbin
-mkdir %{buildroot}%{prefix}/CASA/images
+mkdir -p %{buildroot}%{bin_prefix}/include
-mkdir %{buildroot}%{prefix}/CASA/help
+mkdir -p %{buildroot}%{prefix}/CASA/images
-mkdir %{buildroot}%{prefix}/CASA/help/en
+mkdir -p %{buildroot}%{prefix}/CASA/help
-mkdir %{buildroot}%{prefix}/CASA/doc
+mkdir -p %{buildroot}%{prefix}/CASA/help/en
+mkdir -p %{buildroot}%{prefix}/CASA/doc
 mkdir -p %{buildroot}/%{_lib}/security
+mkdir -p %{buildroot}/etc/init.d
+mkdir -p %{buildroot}/etc/ld.so.conf.d
 
 install -m 755 %{_lib}/lux/dbg/libmicasa.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}
 install -m 755 %{_lib}/lux/dbg/libad_gk.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}
@@ -105,25 +108,27 @@ install -m 755 %{_lib}/lux/dbg/Novell.CASA.DataEngines.KWallet.dll %{buildroot}%
 
 install -m 755 %{binsource}/lux/dbg/micasad.exe %{buildroot}%{bin_prefix}/bin
 install -m 755 %{binsource}/lux/dbg/CASAManager.exe %{buildroot}%{bin_prefix}/bin
-install -m 755 c_gui/CASAManager.sh %{buildroot}%{bin_prefix}/bin
+install -m 755 c_gui/CASAManager.sh %{buildroot}%{bin_prefix}/sbin
 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/images/* %{buildroot}%{prefix}/CASA/images
 install -m 755 c_gui/help/en/* %{buildroot}%{prefix}/CASA/help/en
-install -m 755 c_micasad/startup/micasad %{buildroot}%{bin_prefix}/bin
+install -m 755 c_micasad/startup/micasad %{buildroot}/etc/init.d
-install -m 755 c_micasad/startup/micasad.sh %{buildroot}%{bin_prefix}/bin
+install -m 755 c_micasad/startup/micasad.sh %{buildroot}%{bin_prefix}/sbin
-install -m 755 c_micasad/startup/casacfgpam %{buildroot}%{bin_prefix}/bin
+install -m 755 c_micasad/startup/casacfgpam %{buildroot}%{bin_prefix}/sbin
-install -m 755 c_micasad/startup/casaucfgpam %{buildroot}%{bin_prefix}/bin
+install -m 755 c_micasad/startup/casaucfgpam %{buildroot}%{bin_prefix}/sbin
 
 install -m 755 %{_lib}/lux/dbg/pam_micasa.so %{buildroot}/%{_lib}/security
 
 install -d %{buildroot}%{bin_prefix}/%{_lib}
 install -d %{buildroot}%{bin_prefix}/bin
+install -d %{buildroot}%{bin_prefix}/sbin
 install -d %{buildroot}%{bin_prefix}/include
 install -d %{buildroot}%{prefix}/CASA/doc
 install -d %{buildroot}%{prefix}/CASA/images
 install -d %{buildroot}%{prefix}/CASA/help/en
 install -d %{buildroot}/%{_lib}/security
+install -d %{buildroot}/etc/init.d
 
 #install -m 644 %{buildroot}%{prefix}/%{_lib}/miCASA.jar %{buildroot}%{prefix}/CASA/%{_lib}
 
@@ -145,9 +150,7 @@ ln -s libkwallets_rw.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libkwallets_r
 ln -s libad_gk.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libad_gk.so
 ln -s libad_gk.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libad_gk.so.1
 
-mkdir -p %{buildroot}/etc/init.d
+ln -s /etc/init.d/micasad %{buildroot}%{bin_prefix}/sbin/rcmicasad 
-mkdir -p %{buildroot}/etc/ld.so.conf.d
-cp %{buildroot}%{bin_prefix}/bin/micasad %{buildroot}/etc/init.d
 echo "/usr/%{_lib}/" >> %{buildroot}/etc/ld.so.conf.d/CASA.conf
 
 
@@ -155,14 +158,16 @@ echo "/usr/%{_lib}/" >> %{buildroot}/etc/ld.so.conf.d/CASA.conf
 echo " "
 %{fillup_and_insserv -y micasad}
 echo " "
-if [ "x$1" == "x1" ] || [ "x$1" == "x2" ]
+#if [ "x$1" == "x1" ] || [ "x$1" == "x2" ]
-then
+#then
-        casacfgpam
+#	casacfgpam
-fi
+#fi
+casacfgpam
 /sbin/ldconfig
 
 %post gui
 /sbin/ldconfig
+cp -f /usr/share/doc/packages/CASA/CASAManager.desktop /usr/share/applications/
 %preun
 %stop_on_removal micasad
 if [ "x$1" == "x0" ]
@@ -179,14 +184,13 @@ fi
 
 %postun gui
 /sbin/ldconfig
+rm -f /usr/share/applications/CASAManager.desktop
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-#%dir %{prefix}
 %dir %{prefix}/CASA
-#%dir %{bin_prefix}/%{_lib}
 %dir %{prefix}/CASA/doc
 %dir %{bin_prefix}/%{_lib}/libmicasa.so.%{bldno}
 %dir %{bin_prefix}/%{_lib}/libmicasa.so
@@ -197,11 +201,15 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{bin_prefix}/%{_lib}/Novell.CASA.miCASAWrapper.dll
 %dir %{bin_prefix}/%{_lib}/Novell.CASA.Common.dll
 
-#%dir %{bin_prefix}/bin
+/etc/init.d/micasad
-%{bin_prefix}/bin/micasad
+/%{_lib}/security/pam_micasa.so
-%{bin_prefix}/bin/micasad.sh
+/etc/ld.so.conf.d/CASA.conf
-%{bin_prefix}/bin/casacfgpam
+
-%{bin_prefix}/bin/casaucfgpam
+%{bin_prefix}/sbin/rcmicasad
+%{bin_prefix}/sbin/casacfgpam
+%{bin_prefix}/sbin/casaucfgpam
+%{bin_prefix}/sbin/micasad.sh
+
 %{bin_prefix}/bin/micasad.exe
 
 %{prefix}/CASA/doc/CASA_Reference_Guide.pdf
@@ -209,26 +217,19 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/CASA/doc/Readme.txt
 
 
-/etc/init.d/micasad
-/%{_lib}/security/pam_micasa.so
-/etc/ld.so.conf.d/CASA.conf
-
 %files devel 
 %defattr(-,root,root)
-#%{bin_prefix}/include
 %{bin_prefix}/include/micasa_mgmd.h
 %{bin_prefix}/include/micasa_types.h
 
 
 %files gui
 %defattr(-,root,root)
-#%dir %{bin_prefix}/bin/
+%{bin_prefix}/sbin/CASAManager.sh
-%{bin_prefix}/bin/CASAManager.sh
 %{bin_prefix}/bin/CASAManager.exe.config
 %{bin_prefix}/bin/CASAManager.exe
 %{prefix}/CASA/CASAManager.desktop
 
-#%dir %{bin_prefix}/%{_lib}/
 
 %{bin_prefix}/%{_lib}/libad_gk.so.%{bldno}
 %{bin_prefix}/%{_lib}/libad_gk.so