fix bug 173401

This commit is contained in:
jvdias 2005-11-16 23:21:43 +00:00
parent e07b5b90e7
commit 05911d2b1f

View File

@ -11,10 +11,11 @@
# Use "rpm -[iU]vh --define 'AUTOSTART 1'" in order to have cimserver enabled
# (chkconfig --level=345 tog-pegasus on) after installation.
#
#%define debug_package %{nil}
Summary: OpenPegasus WBEM Services for Linux
Name: tog-pegasus
Version: 2.5
Release: 3
Release: 4
Epoch: 2
Group: Systems Management/Base
License: Open Group Pegasus Open Source
@ -31,6 +32,7 @@ Patch1: pegasus-2.5-local-or-remote-auth.patch
Patch2: pegasus-2.5-make_install.patch
Patch3: pegasus-2.5-add_cmpi_provider_lib.patch
Patch4: pegasus-2.5-enable_cql.patch
Patch5: pegasus-2.5-bz173401.patch
BuildRequires: bash, sed, grep, coreutils, procps, gcc, gcc-c++, libstdc++, make, pam-devel, krb5-devel, krb5-libs, openssl-devel >= 0.9.6, e2fsprogs
Requires: bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools
Requires(post): bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools
@ -75,6 +77,7 @@ The OpenPegasus WBEM tests for the OpenPegasus 2.5 Linux rpm.
%patch2 -p1 -b .make_install
%patch3 -p1 -b .add_cmpi_provider_lib
%patch4 -p1 -b .enable_cql
%patch5 -p1 -b .bz173401
%build
rm -rf $RPM_BUILD_ROOT
@ -102,6 +105,9 @@ export LD_LIBRARY_PATH=${PEGASUS_HOME}/%{_lib}:/%{_lib}:/usr/%{_lib}
unset PEGASUS_STAGING_DIR
export PEGASUS_SDK_STAGING_DIR=${PEGASUS_HOME}/stageSDK
make install
#!!!!!!!!!!!!!!
exit 1
#!!!!!!!!!!!!!!
rm -rf $PEGASUS_HOME
mkdir -p $RPM_BUILD_ROOT{${PEGASUS_CONFIG_DIR},${PEGASUS_VARRUN_DIR},${PEGASUS_LOG_DIR},$PEGASUS_VARDATA_DIR}
touch $RPM_BUILD_ROOT{${PEGASUS_CONFIG_DIR}/{cimserver_{current,planned}.conf,ssl.cnf,client.pem,server.pem,file.pem,client_2048.pem,server_2048.pem,file_2048.pem},${PEGASUS_LOG_DIR}/install.log,${PEGASUS_VARRUN_DIR}/cimxml.socket}
@ -113,6 +119,8 @@ mkdir -p $RPM_BUILD_ROOT/${PEGASUS_PRODSHARE_DIR}/scripts
cp -fp %SOURCE4 $RPM_BUILD_ROOT/${PEGASUS_PRODSHARE_DIR}/scripts
chmod 750 $RPM_BUILD_ROOT/${PEGASUS_PRODSHARE_DIR}/scripts/genSSLcerts
mkdir -p $R$RPM_BUILD_ROOT/usr/%{_lib}/cmpi
#/usr/lib/rpm/brp-compress
#exit 0
:;
%files
@ -225,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT;
#rm -rf ${RPM_BUILD_DIR}/%{srcname}-%{version};
%changelog
* Wed Nov 16 2005 Jason Vas Dias <jvdias@redhat.com> - 2:tog-pegasus-2.5-4
- fix bug 173401: SSL support broken by openssl-0.9.7g -> 0.9.8a upgrade
* Wed Nov 09 2005 Jason Vas Dias <jvdias@redhat.com> - 2:tog-pegasus-2.5-3
- Rebuild for new openssl dependencies
- Enable CMPI support for sblim-cmpi-base with ENABLE_CQL=true