git.samba.org / tpot / pegasus.git.bak / pegasus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e5c07a6)
BUG#: 8312
authordenise.eckstein <denise.eckstein>
Thu, 15 Jan 2009 20:41:33 +0000 (20:41 +0000)
committerdenise.eckstein <denise.eckstein>
Thu, 15 Jan 2009 20:41:33 +0000 (20:41 +0000)
TITLE: Set version status for 2.10.0 development

DESCRIPTION: Change version status for 2.10.0 development.

14 files changed:
Makefile.Release patch | blob | history
env_var_HPUX.status patch | blob | history
env_var_Linux.status patch | blob | history
mak/version-windows.RC patch | blob | history
rpm/tog-pegasus.spec patch | blob | history
rpm/tog-specfiles/tog-pegasus-arch.spec patch | blob | history
rpm/tog-specfiles/tog-pegasus-packages.spec patch | blob | history
rpm/tog-specfiles/tog-pegasus-preun.spec patch | blob | history
src/Clients/cimreparchive/tests/result.master patch | blob | history
src/Clients/cimsub/tests/testscript/result.master patch | blob | history
src/Clients/cimsub/tests/testscript/result.master.nocql patch | blob | history
src/Clients/wbemexec/tests/result.master patch | blob | history
src/Clients/wbemexec/tests/result.master.nossl patch | blob | history
src/Pegasus/Common/PegasusVersion.h patch | blob | history

diff --git a/Makefile.Release b/Makefile.Release
index f751957d30e29a0dca4a7613ba6ddda9779f376f..f7fbb8f32d4b1b3ce746bebd37bc6bfd42884c01 100644 (file)
--- a/Makefile.Release
+++ b/Makefile.Release
@@ -711,7 +711,7 @@ _append_OpenPegasusLicenseToSpecFile: FORCE
        @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-header.spec >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "#" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
-       @$(ECHO-E) "# WARNING: This file is automatically generated by executing " >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+       @$(ECHO-E) "# WARNING: This file is automatically generated by executing" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "#   make -f pegasus/Makefile.Release create_OpenPegasusRPMSpecFile" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "# Any changes made directly to this file in the OpenPegasus source will" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "# be lost the next time this file is regenerated and submitted to CVS." >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@@ -856,7 +856,7 @@ _append_preSectionToSpecFile: FORCE
        @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
        @$(ECHO-E) "# When Privilege Separation is enabled, create the" \
-            "'$(CIMSERVERMAIN_USR)' user and ">> $(PEGASUS_RPM_SPEC_FILE_PATH)
+            "'$(CIMSERVERMAIN_USR)' user and">> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "# '$(CIMSERVERMAIN_GRP)' group which are used" \
             "as the context of the cimservermain process" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@@ -987,7 +987,7 @@ _append_postunSectionToSpecFile: FORCE
        @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
        @$(ECHO-E) "# When Privilege Separation is enabled, delete the" \
-            "'$(CIMSERVERMAIN_USR)' user and ">> $(PEGASUS_RPM_SPEC_FILE_PATH)
+            "'$(CIMSERVERMAIN_USR)' user and">> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "# '$(CIMSERVERMAIN_GRP)' group which are used" \
             "as the context of the cimservermain process" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@@ -1028,11 +1028,11 @@ _append_filesSectionToSpecFile: FORCE
              if [ $(i) != $(PEGASUS_MOF_DIR) ]; then \
                    $(ECHO-E) "%dir $(i)" >> \
              $(PEGASUS_RPM_SPEC_FILE_PATH); fi; fi; fi; fi; fi;fi;)
-       @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_DIR_2) " \
+       @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_DIR_2)" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
-       @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_LIB_DIR_2) " \
+       @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_LIB_DIR_2)" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
-       @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_MANAGER_LIB_DIR_2) " \
+       @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_MANAGER_LIB_DIR_2)" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "%dir %attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))"\
diff --git a/env_var_HPUX.status b/env_var_HPUX.status
index 19c06d2c9bdd9fe4dabc15fd922dbed17224e38d..9c4314cc586460a5af2396da23706f64ae0e4bd8 100644 (file)
--- a/env_var_HPUX.status
+++ b/env_var_HPUX.status
@@ -10,7 +10,7 @@ PEGASUS_ENABLE_MAKE_INSTALL = yes
 PEGASUS_OVERRIDE_PRODUCT_ID=yes
 PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS=yes
 PEGASUS_PRODUCT_NAME="OpenPegasus"
-PEGASUS_PRODUCT_VERSION="2.9.0"
+PEGASUS_PRODUCT_VERSION="2.10.0"
 PEGASUS_PRODUCT_STATUS="Development"
 
 PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
diff --git a/env_var_Linux.status b/env_var_Linux.status
index f955ed7b9ca91a3577c1c003eb2bab241d990050..400c1b0162a7a6d0b6cf995143bc72122940f289 100644 (file)
--- a/env_var_Linux.status
+++ b/env_var_Linux.status
@@ -9,7 +9,7 @@ PEGASUS_ENABLE_MAKE_INSTALL = yes
 PEGASUS_OVERRIDE_PRODUCT_ID=yes
 PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS=yes
 PEGASUS_PRODUCT_NAME="OpenPegasus"
-PEGASUS_PRODUCT_VERSION="2.9.0"
+PEGASUS_PRODUCT_VERSION="2.10.0"
 PEGASUS_PACKAGE_VERSION=1
 PEGASUS_PRODUCT_STATUS="Development"
 
@@ -51,7 +51,7 @@ PEGASUS_PROVIDER_LIB_DIR_3 = $(PEGASUS_PROVIDER_DIR_3)/providers
 PEGASUS_PROVIDER_MANAGER_LIB_DIR = $(PEGASUS_PROVIDER_DIR)/providerManagers
 PEGASUS_PROVIDER_MANAGER_LIB_DIR_2 = $(PEGASUS_PROVIDER_DIR_2)/providerManagers
 
-PEGASUS_DOC_DIR = /usr/share/doc/tog-pegasus-2.9
+PEGASUS_DOC_DIR = /usr/share/doc/tog-pegasus-2.10
 PEGASUS_MAN_DIR = /usr/share/man
 PEGASUS_MANUSER_DIR = $(PEGASUS_MAN_DIR)/man1
 PEGASUS_MANADMIN_DIR = $(PEGASUS_MAN_DIR)/man8
diff --git a/mak/version-windows.RC b/mak/version-windows.RC
index 62fe58d1915b247294db6683c97c21c8cd29c32d..d5bbcc05ee6a845bb758f2b58dcdd76a63cc1f87 100644 (file)
--- a/mak/version-windows.RC
+++ b/mak/version-windows.RC
@@ -2,8 +2,8 @@
 
 1 VERSIONINFO
 
-FILEVERSION 2,8,0
-PRODUCTVERSION 2,8,0
+FILEVERSION 2,10,0
+PRODUCTVERSION 2,10,0
 FILEFLAGSMASK 0x00
 FILEFLAGS 0x00
 FILEOS VOS__WINDOWS32
@@ -14,8 +14,8 @@ BEGIN
     BEGIN
         BLOCK "040904E4"
         BEGIN
-            VALUE "FileVersion",      "2.8.0\0"
-            VALUE "ProductVersion",   "2.8.0\0"
+            VALUE "FileVersion",      "2.10.0\0"
+            VALUE "ProductVersion",   "2.10.0\0"
         END
     END
 END
diff --git a/rpm/tog-pegasus.spec b/rpm/tog-pegasus.spec
index 56e6bed73b36f56b618641d7560e476ad3a0cc6d..5518a04394f61a8af83f7e3990f5e5c8f7c1b81e 100644 (file)
--- a/rpm/tog-pegasus.spec
+++ b/rpm/tog-pegasus.spec
@@ -40,7 +40,7 @@
 #
 
 %define packageVersion 1
-Version: 2.9.0
+Version: 2.10.0
 Release: %{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}}
 Epoch:   1
 
@@ -157,7 +157,7 @@ sources.
 %global PEGASUS_REPOSITORY_PARENT_DIR /var/lib/Pegasus
 %global PEGASUS_PREV_REPOSITORY_DIR /var/lib/Pegasus/prev_repository
 %global PEGASUS_SBIN_DIR /usr/sbin
-%global PEGASUS_DOC_DIR /usr/share/doc/tog-pegasus-2.9
+%global PEGASUS_DOC_DIR /usr/share/doc/tog-pegasus-2.10
 
 %global PEGASUS_RPM_ROOT  $RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION
 %global PEGASUS_RPM_HOME %PEGASUS_RPM_ROOT/build
@@ -450,7 +450,7 @@ fi
 /usr/share/Pegasus/mof
 
 %defattr(600,root,pegasus,755)
-%dir /usr/share/doc/tog-pegasus-2.9
+%dir /usr/share/doc/tog-pegasus-2.10
 %dir /usr/share/Pegasus
 %dir /usr/share/Pegasus/scripts
 %dir /var/lib/Pegasus
@@ -486,10 +486,10 @@ fi
 %attr(644,root,pegasus) /usr/share/man/man1/*
 %attr(644,root,pegasus) /usr/share/man/man8/*
 
-%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.9/Admin_Guide_Release.pdf
-%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.9/PegasusSSLGuidelines.htm
-%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.9/license.txt
-%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.9/OpenPegasusNOTICE.txt
+%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.10/Admin_Guide_Release.pdf
+%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.10/PegasusSSLGuidelines.htm
+%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.10/license.txt
+%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.10/OpenPegasusNOTICE.txt
 /usr/%PEGASUS_ARCH_LIB/libpegclient.so
 /usr/%PEGASUS_ARCH_LIB/libpegcommon.so
 /usr/%PEGASUS_ARCH_LIB/libpegprovider.so
@@ -505,7 +505,7 @@ fi
 %defattr(644,root,pegasus,755)
 /usr/share/Pegasus/samples
 /usr/include/Pegasus
-%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.9/SecurityGuidelinesForDevelopers.html
+%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.10/SecurityGuidelinesForDevelopers.html
 /usr/share/Pegasus/html
 
 %if %{PEGASUS_BUILD_TEST_RPM}
diff --git a/rpm/tog-specfiles/tog-pegasus-arch.spec b/rpm/tog-specfiles/tog-pegasus-arch.spec
index f096ee865336674a9be08f9526d28cf1a9453c35..1f021407683b3e2ecb1a3d84170aa45eb20ae190 100644 (file)
--- a/rpm/tog-specfiles/tog-pegasus-arch.spec
+++ b/rpm/tog-specfiles/tog-pegasus-arch.spec
@@ -19,10 +19,10 @@
 %global PEGASUS_HARDWARE_PLATFORM LINUX_ZSERIES64_GNU
 %else
 %global PEGASUS_HARDWARE_PLATFORM LINUX_IX86_GNU
-%endif 
-%endif 
-%endif 
-%endif 
+%endif
+%endif
+%endif
+%endif
 %endif
 %endif
 #
diff --git a/rpm/tog-specfiles/tog-pegasus-packages.spec b/rpm/tog-specfiles/tog-pegasus-packages.spec
index 5d4e9cd0872c1a536b4515dfa818c203d6d3e4fe..138b80011ff77720c7cf3524d56f223add4fdc7a 100644 (file)
--- a/rpm/tog-specfiles/tog-pegasus-packages.spec
+++ b/rpm/tog-specfiles/tog-pegasus-packages.spec
@@ -16,7 +16,7 @@ supports C provider developers via the CMPI interface.
 %package test
 Summary: The OpenPegasus Tests
 Group: Systems Management/Base
-Requires: tog-pegasus >= %{version} 
+Requires: tog-pegasus >= %{version}
 
 %description test
 The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm.
diff --git a/rpm/tog-specfiles/tog-pegasus-preun.spec b/rpm/tog-specfiles/tog-pegasus-preun.spec
index f332e3dc7cf6a25814b0f17213302670ceab0a27..d1742751d55cfbb584e4a16cc8199df7a92579fa 100644 (file)
--- a/rpm/tog-specfiles/tog-pegasus-preun.spec
+++ b/rpm/tog-specfiles/tog-pegasus-preun.spec
@@ -6,7 +6,7 @@ if [ $1 -eq 0 ]; then
    isRunning=`ps -el | grep cimserver |  grep -v "grep cimserver"`
    if [ "$isRunning" ]; then
       %PEGASUS_SBIN_DIR/cimserver -s
-   fi 
+   fi
    /sbin/chkconfig --del tog-pegasus;
    rm -f %PEGASUS_VARDATA_DIR/cimserver_current.conf;
    [ -d %PEGASUS_REPOSITORY_DIR ]  && rm -rf %PEGASUS_REPOSITORY_DIR;
diff --git a/src/Clients/cimreparchive/tests/result.master b/src/Clients/cimreparchive/tests/result.master
index a10504436282c01e74c05a0b7a5219792bd23a62..44833595e89e1232f7a3ae5b5f2f81a1d1ad1cbd 100644 (file)
--- a/src/Clients/cimreparchive/tests/result.master
+++ b/src/Clients/cimreparchive/tests/result.master
@@ -28,6 +28,6 @@ Options:
     --version  - Display CIM Server version number
 
 Show version
-Version 2.9.0
+Version 2.10.0
 Invalid archive file
 Success
diff --git a/src/Clients/cimsub/tests/testscript/result.master b/src/Clients/cimsub/tests/testscript/result.master
index 5362975b8712698b0ca10ee69ad78971626e0b78..3d269e0e3d9b5b56da9d9608f2c5a7cbdb2a566b 100644 (file)
--- a/src/Clients/cimsub/tests/testscript/result.master
+++ b/src/Clients/cimsub/tests/testscript/result.master
@@ -162,7 +162,7 @@ cimsub: option "-n" was unexpected
 cimsub: Use '--help' to obtain command syntax.
 
 Display version.
-Version 2.9.0
+Version 2.10.0
 
 Unexpected option, combine enable and disable.
 cimsub: option "-e" was unexpected
diff --git a/src/Clients/cimsub/tests/testscript/result.master.nocql b/src/Clients/cimsub/tests/testscript/result.master.nocql
index 95635cf3c796a05d61b9c9846bf82ee031022a55..6d705d9851b248cedc65842eff1e09099f6c7a9d 100644 (file)
--- a/src/Clients/cimsub/tests/testscript/result.master.nocql
+++ b/src/Clients/cimsub/tests/testscript/result.master.nocql
@@ -162,7 +162,7 @@ cimsub: option "-n" was unexpected
 cimsub: Use '--help' to obtain command syntax.
 
 Display version.
-Version 2.9.0
+Version 2.10.0
 
 Unexpected option, combine enable and disable.
 cimsub: option "-e" was unexpected
diff --git a/src/Clients/wbemexec/tests/result.master b/src/Clients/wbemexec/tests/result.master
index fe56370ba1fd87af366cee0ce745c563e55b12cb..cd1dee72b3c6dbfd0f45e6fbb97be01b6fa576cf 100644 (file)
--- a/src/Clients/wbemexec/tests/result.master
+++ b/src/Clients/wbemexec/tests/result.master
@@ -39,7 +39,7 @@ Options :
 Usage note: The wbemexec command requires that the CIM Server is running.
 
  
-Version 2.9.0
+Version 2.10.0
   
 All options specified except hostname
 wbemexec -p5988 -v1.1 -mM-POST -t10000 -u(PEGASUS_TEST_USER_ID) -w(PEGASUS_TEST_USER_PASS) ./cimrequest.xml
diff --git a/src/Clients/wbemexec/tests/result.master.nossl b/src/Clients/wbemexec/tests/result.master.nossl
index f1de98ce915c433e7c4b422534ddb0cbc1a44655..1092d236a357b0cda9255846dca75199a130b0e3 100644 (file)
--- a/src/Clients/wbemexec/tests/result.master.nossl
+++ b/src/Clients/wbemexec/tests/result.master.nossl
@@ -38,7 +38,7 @@ Options :
 Usage note: The wbemexec command requires that the CIM Server is running.
 
  
-Version 2.9.0
+Version 2.10.0
   
 All options specified except hostname
 wbemexec -p5988 -v1.1 -mM-POST -t10000 -u(PEGASUS_TEST_USER_ID) -w(PEGASUS_TEST_USER_PASS) ./cimrequest.xml
diff --git a/src/Pegasus/Common/PegasusVersion.h b/src/Pegasus/Common/PegasusVersion.h
index ef0cb7f00f74b87a14c2212a4c4157d8951d4a6c..74ec12a9bd257f9d0e7b19a62b4ba239800282a3 100644 (file)
--- a/src/Pegasus/Common/PegasusVersion.h
+++ b/src/Pegasus/Common/PegasusVersion.h
@@ -73,7 +73,7 @@
 # define PEGASUS_PRODUCT_NAME    "CIM Server"
 
 # define PEGASUS_PRODUCT_STATUS  "Development"
-# define PEGASUS_PRODUCT_VERSION "2.9.0"
+# define PEGASUS_PRODUCT_VERSION "2.10.0"
 
 # define PEGASUS_CIMOM_GENERIC_NAME "Pegasus"
 // If the following is non-zero length it becomes SLP description.
@@ -147,6 +147,6 @@ static const char *PLATFORM_EMBEDDED_IDENTIFICATION_STRING =
 // CAUTION: always check whether PEGASUS_VERSION_NUMBER is defined when
 // integrating with versions prior to 2.5.1.
 //
-#define PEGASUS_VERSION_NUMBER 0x02090000
+#define PEGASUS_VERSION_NUMBER 0x02100000
 
 #endif /* Pegasus_Version_h */
Unnamed repository; edit this file to name it for gitweb.