Changes requested by Rudy at SuSE were integreated for the stable build of NLD 10 to the main line development.

This commit is contained in:
Cameron (Kamran) Mashayekhi 2005-12-13 19:00:37 +00:00
parent 8f36de6bc7
commit 1361175b6b
3 changed files with 21 additions and 34 deletions

View File

@ -22,6 +22,7 @@
#define PAM_SM_ACCOUNT
#define PAM_SM_SESSION
#include <sys/syslog.h>
#include <security/pam_modules.h>
#include <security/_pam_macros.h>

View File

@ -1,5 +1,5 @@
#
# spec file for package CASA (Version 1.5.0)
# spec file for package CASA (Version 1.6.0)
#
# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -18,10 +18,11 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: Productivity/Other
Autoreqprov: on
%define bldno 1.1.1
Version: 1.5.000
Version: 1.6.000
Release: 0
Summary: Novell Common Authentication Service Adapter (CASA)
Source: %{name}-%{version}.tar.bz2
#Patch: %{name}-%{version}.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
requires: mono >= 1.1.7
ExclusiveArch: %ix86 x86_64
@ -60,7 +61,7 @@ to one another.
%prep
%setup -q
#%patch
%ifarch x86_64
%define binsource bin64
%else
@ -70,7 +71,7 @@ to one another.
%build
export PATH=.:$PATH
export PATH=.:$PATH:/usr/%_lib/qt3/bin
mk-cai-all
%install

View File

@ -1,5 +1,5 @@
#
# spec file for package CASA (Version 1.5.0)
# spec file for package CASA (Version 1.6.0)
#
# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -18,10 +18,11 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: Productivity/Other
Autoreqprov: on
%define bldno 1.1.1
Version: 1.5.000
Version: 1.6.000
Release: 0
Summary: Novell Common Authentication Service Adapter (CASA)
Source: %{name}-%{version}.tar.bz2
#Patch: %{name}-%{version}.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
requires: mono >= 1.1.7
ExclusiveArch: %ix86 x86_64
@ -60,7 +61,7 @@ to one another.
%prep
%setup -q
#%patch
%ifarch x86_64
%define binsource bin64
%else
@ -70,8 +71,8 @@ to one another.
%build
export PATH=.:$PATH
mk-ca-all
export PATH=.:$PATH:/usr/%_lib/qt3/bin
mk-cai-all
%install
@ -102,11 +103,10 @@ install -m 755 %{binsource}/lux/dbg/CASAManager.exe %{buildroot}%{prefix}/CASA/b
install -m 755 c_gui/CASAManager.sh %{buildroot}%{prefix}/CASA/bin
install -m 755 c_gui/CASAManager.exe.config %{buildroot}%{prefix}/CASA/bin
install -m 755 c_gui/CASAManager.desktop %{buildroot}%{prefix}/CASA/
cp -f c_gui/images/* %{buildroot}%{prefix}/CASA/images
cp -f c_gui/help/en/* %{buildroot}%{prefix}/CASA/help/en
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}%{prefix}/CASA/bin
install -m 755 c_micasad/startup/micasad.sh %{buildroot}%{prefix}/CASA/bin
#install -m 755 c_clientlogin/novell-ncl-autologin.sh %{buildroot}%{prefix}/CASA/bin
install -m 755 %{_lib}/lux/dbg/pam_micasa.so %{buildroot}/%{_lib}/security
@ -123,21 +123,12 @@ install -d %{buildroot}/%{_lib}/security
#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/License.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/* %{buildroot}%{prefix}/CASA/include
#cp -f include/micasa.h %{buildroot}%{prefix}/CASA/include/
#cp -f include/micasa_mgmd.h %{buildroot}%{prefix}/CASA/include/
#cp -f doc/CASA_Reference_Guide.pdf %{buildroot}%{prefix}/CASA/doc/
#cp -f doc/Readme.txt %{buildroot}%{prefix}/CASA/doc/
#cp -f doc/License.txt %{buildroot}%{prefix}/CASA/doc/
ln -s ../CASA/bin/micasad.exe %{buildroot}%{prefix}/bin/micasad.exe
ln -s ../CASA/bin/micasad.sh %{buildroot}%{prefix}/bin/micasad.sh
ln -s ../CASA/bin/micasad %{buildroot}%{prefix}/bin/micasad
@ -177,10 +168,6 @@ 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
# autologin
#mkdir -p %{buildroot}/etc/profile.d
#cp %{buildroot}%{prefix}/CASA/bin/novell-ncl-autologin.sh %{buildroot}/etc/profile.d
mkdir -p %{buildroot}/etc/init.d
mkdir -p %{buildroot}/etc/ld.so.conf.d
cp %{buildroot}%{prefix}/CASA/bin/micasad %{buildroot}/etc/init.d
@ -194,6 +181,8 @@ then
fi
/sbin/ldconfig
%post gui
/sbin/ldconfig
%preun
@ -204,6 +193,8 @@ fi
%insserv_cleanup
/sbin/ldconfig
%postun gui
/sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
@ -245,8 +236,6 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/bin/micasad.sh
%{prefix}/bin/micasad.exe
#%dir %{prefix}/CASA/doc
/etc/init.d/micasad
/%{_lib}/security/pam_micasa.so
/etc/ld.so.conf.d/CASA.conf
@ -256,9 +245,6 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/include
%{prefix}/CASA/include
%{prefix}/CASA/%{_lib}/*.so
%{prefix}/CASA/doc/CASA_Reference_Guide.pdf
%{prefix}/CASA/doc/License.txt
%{prefix}/CASA/doc/Readme.txt
%files gui
@ -268,8 +254,6 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/CASA/bin/CASAManager.exe.config
%{prefix}/CASA/bin/CASAManager.exe
%{prefix}/CASA/CASAManager.desktop
%{prefix}/CASA/doc/License.txt
%{prefix}/CASA/doc/Readme.txt
%dir %{prefix}/CASA/%{_lib}/
@ -295,9 +279,10 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/%{_lib}/Novell.CASA.DataEngines.KWallet.dll
%dir %{prefix}/CASA/images
%dir %{prefix}/CASA/images/*
%{prefix}/CASA/images/*
%dir %{prefix}/CASA/help
%dir %{prefix}/CASA/help/en
%dir %{prefix}/CASA/help/en/*
%{prefix}/CASA/help/en/*
%changelog -n CASA