From 176663097ff345e0bf889945307f044dc3e72050 Mon Sep 17 00:00:00 2001 From: vcrhonek Date: Fri, 23 Nov 2007 08:55:42 +0000 Subject: [PATCH] Fix OpenPegasus SRPM fails to build Test RPM --- RedHat.OpenPegasus.Makefile | 14 +------------- tog-pegasus.spec | 18 +++++++++++------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/RedHat.OpenPegasus.Makefile b/RedHat.OpenPegasus.Makefile index 4530952..c2f5fd2 100644 --- a/RedHat.OpenPegasus.Makefile +++ b/RedHat.OpenPegasus.Makefile @@ -395,7 +395,7 @@ repository: # test package : TESTLIBS:=$(B)/lib/libFamilyProvider.so.1 $(B)/lib/libIndicationStressTestConsumer.so.1 $(B)/lib/libIndicationStressTestProvider.so.1 $(B)/lib/libSampleInstanceProvider.so.1 $(B)/lib/libSampleMethodProvider.so.1 -TESTBINS:=$(B)/bin/TestAbstract $(B)/bin/TestArray $(B)/bin/TestAsyncQueue $(B)/bin/TestBase64 $(B)/bin/TestClassDecl $(B)/bin/TestDateTime $(B)/bin/TestFlavor $(B)/bin/TestFormatter $(B)/bin/TestHashTable $(B)/bin/TestInstanceDecl $(B)/bin/TestList $(B)/bin/TestLogger $(B)/bin/TestMethod $(B)/bin/TestObject $(B)/bin/TestOperationContext $(B)/bin/TestParamValue $(B)/bin/TestParameter $(B)/bin/TestProperty $(B)/bin/TestQualifier $(B)/bin/TestQualifierDecl $(B)/bin/TestQualifierList $(B)/bin/TestReference $(B)/bin/TestResolve $(B)/bin/TestResponseHandler $(B)/bin/TestScope $(B)/bin/TestStack $(B)/bin/TestStopwatch $(B)/bin/TestStrToInstName $(B)/bin/TestString $(B)/bin/TestTimeValue $(B)/bin/TestToMof $(B)/bin/TestTracer $(B)/bin/TestValidateClass $(B)/bin/TestValue $(B)/bin/TestClient $(B)/bin/TestOSTestClient $(B)/bin/TestPegClientInvokeMethod2 $(B)/bin/TestIndicationStressTest +TESTBINS:=$(B)/bin/TestAbstract $(B)/bin/TestArray $(B)/bin/TestAsyncQueue $(B)/bin/TestBase64 $(B)/bin/TestClassDecl $(B)/bin/TestDateTime $(B)/bin/TestFlavor $(B)/bin/TestFormatter $(B)/bin/TestHashTable $(B)/bin/TestInstanceDecl $(B)/bin/TestList $(B)/bin/TestLogger $(B)/bin/TestMethod $(B)/bin/TestObject $(B)/bin/TestOperationContext $(B)/bin/TestParamValue $(B)/bin/TestParameter $(B)/bin/TestProperty $(B)/bin/TestQualifier $(B)/bin/TestQualifierDecl $(B)/bin/TestQualifierList $(B)/bin/TestReference $(B)/bin/TestResolve $(B)/bin/TestResponseHandler $(B)/bin/TestScope $(B)/bin/TestStack $(B)/bin/TestStopwatch $(B)/bin/TestStrToInstName $(B)/bin/TestString $(B)/bin/TestTimeValue $(B)/bin/TestToMof $(B)/bin/TestTracer $(B)/bin/TestValidateClass $(B)/bin/TestValue $(B)/bin/TestClient $(B)/bin/TestPegClientInvokeMethod2 $(B)/bin/TestIndicationStressTest $(B)/lib/libFamilyProvider.so.1: $(B)/lib/libpegcommon.so.1 $(MAKE) -C $(R)/src/Providers/TestProviders/FamilyProvider @@ -511,30 +511,18 @@ $(B)/bin/TestValue: $(B)/lib/libpegcommon.so.1 $(B)/bin/TestTracer: $(B)/lib/libpegcommon.so.1 $(MAKE) -C $(R)/src/Pegasus/Common/tests/Tracer -$(B)/bin/TestIPC: $(B)/lib/libpegcommon.so.1 - $(MAKE) -C $(R)/src/Pegasus/Common/tests/IPC - $(B)/bin/TestResponseHandler: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegcql.so.1 $(MAKE) -C $(R)/src/Pegasus/ProviderManager2/Default/tests/ResponseHandler $(B)/bin/TestClient: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegclient.so.1 $(MAKE) -C $(R)/src/Clients/TestClient -$(B)/bin/TestOSTestClient: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegclient.so.1 - $(MAKE) -C $(R)/src/Providers/ManagedSystem/OperatingSystem/tests/OSTestClient - $(B)/bin/TestPegClientInvokeMethod2: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegclient.so.1 $(MAKE) -C $(R)/src/Pegasus/Client/tests/InvokeMethod2 $(B)/bin/TestIndicationStressTest: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpeglistener.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegexportserver.so.1 $(MAKE) -C $(R)/src/Providers/TestProviders/IndicationStressTestProvider/testclient -$(B)/bin/TestAsyncQueue: $(B)/lib/libpegcommon.so.1 - $(MAKE) -C $(R)/src/Pegasus/Common/tests/AsyncQueue - -$(B)/bin/TestList: $(B)/lib/libpegcommon.so.1 - $(MAKE) -C $(R)/src/Pegasus/Common/tests/List - tests: $(TESTLIBS) $(TESTBINS) install_tests: tests test_dirs test_lib test_bin test_mak test_makefile test_repository diff --git a/tog-pegasus.spec b/tog-pegasus.spec index 75d86fb..cce30a2 100644 --- a/tog-pegasus.spec +++ b/tog-pegasus.spec @@ -41,7 +41,7 @@ %endif Version: 2.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 # Summary: OpenPegasus WBEM Services for Linux @@ -440,7 +440,11 @@ fi %changelog -* Mon Nov 19 2007 Vitezslav Crhonek - 2.7.0-1 +* Fri Nov 23 2007 Vitezslav Crhonek - 2:2.7.0-2 +- Fix OpenPegasus SRPM fails to build Test RPM + Resolves: #391961 + +* Mon Nov 19 2007 Vitezslav Crhonek - 2:2.7.0-1 - Update to upstream version 2.7.0 - Unhide some cmpi classes, package cmpi C++ headers - Fix multiarch conflicts @@ -448,19 +452,19 @@ fi - Add libcmpiCppImpl.so (symlink to libcmpiCppImpl.so.1) Resolves: #366871 -* Tue Oct 9 2007 Vitezslav Crhonek - 2.6.1-2 +* Tue Oct 9 2007 Vitezslav Crhonek - 2:2.6.1-2 - Fix files permissions Resolves: #200906 -* Thu Aug 30 2007 Vitezslav Crhonek - 2.6.1-1 +* Thu Aug 30 2007 Vitezslav Crhonek - 2:2.6.1-1 - Update to 2.6.1 - Fix wrong init script (#245339) -* Wed Mar 28 2007 Vitezslav Crhonek - 2.6.0-2 +* Wed Mar 28 2007 Vitezslav Crhonek - 2:2.6.0-2 - Update changelog -- Build with Open Pegasus' Makefiles, istall with RedHats (Mark Hamzy) +- Build with Open Pegasus' Makefiles, istall with Red Hats (Mark Hamzy) -* Mon Feb 26 2007 Mark Hamzy - 2.6.0-1 +* Mon Feb 26 2007 Mark Hamzy - 2:2.6.0-1 - Upgrade to upstream version 2.6.0 * Mon Dec 4 2006 Nalin Dahyabhai - 2:2.5.2-3