diff --git a/sblim-cmpi-base-1.6.2-wrong-UserModeTime-and-KernelModeTime.patch b/sblim-cmpi-base-1.6.2-wrong-UserModeTime-and-KernelModeTime.patch new file mode 100644 index 0000000..57787fe --- /dev/null +++ b/sblim-cmpi-base-1.6.2-wrong-UserModeTime-and-KernelModeTime.patch @@ -0,0 +1,16 @@ +diff -up sblim-cmpi-base-1.6.2/OSBase_UnixProcess.c.orig sblim-cmpi-base-1.6.2/OSBase_UnixProcess.c +--- sblim-cmpi-base-1.6.2/OSBase_UnixProcess.c.orig 2013-06-13 14:23:34.386975408 +0200 ++++ sblim-cmpi-base-1.6.2/OSBase_UnixProcess.c 2013-06-13 14:24:33.505265610 +0200 +@@ -229,9 +229,9 @@ static int _process_data( char * phd , s + strcat( cmd, "/stat"); + + if ( (fpstat=fopen(cmd,"r")) != NULL ) { +- fscanf(fpstat,"%*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s " +- "%lld %lld %*s %*s %*s %*s %*s %ld", +- &umtime,&kmtime,&ctime ); ++ fscanf(fpstat,"%*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s " ++ "%lld %lld %*s %*s %*s %*s %*s %*s %ld", ++ &umtime,&kmtime,&ctime ); + fclose(fpstat); + (*sptr)->kmtime = kmtime*10; + (*sptr)->umtime = umtime*10; diff --git a/sblim-cmpi-base.spec b/sblim-cmpi-base.spec index 0beddbf..82c51b1 100644 --- a/sblim-cmpi-base.spec +++ b/sblim-cmpi-base.spec @@ -1,6 +1,6 @@ Name: sblim-cmpi-base Version: 1.6.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: SBLIM CMPI Base Providers Group: Applications/System @@ -13,6 +13,8 @@ Patch2: sblim-cmpi-base-1.6.0-provider-register-sfcb-init.patch Patch3: sblim-cmpi-base-1.6.1-double-fclose.patch # Patch4: already upstream, http://sourceforge.net/p/sblim/bugs/2634/ Patch4: sblim-cmpi-base-1.6.2-max-cpu-frequency.patch +# Patch5: already upstream, http://sourceforge.net/p/sblim/bugs/2644/ +Patch5: sblim-cmpi-base-1.6.2-wrong-UserModeTime-and-KernelModeTime.patch Requires: cim-server sblim-indication_helper BuildRequires: sblim-cmpi-devel sblim-indication_helper-devel @@ -50,6 +52,7 @@ Testcase Files for the SBLIM Testsuite. %patch2 -p1 -b .provider-register-sfcb-init %patch3 -p1 -b .double-fclose %patch4 -p1 -b .cpu-freq +%patch5 -p1 -b .wrong-UserModeTime-and-KernelModeTime %build %configure TESTSUITEDIR=%{_datadir}/sblim-testsuite --disable-static @@ -80,7 +83,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a %dir %{_datadir}/sblim-testsuite/cim %dir %{_datadir}/sblim-testsuite/system %dir %{_datadir}/sblim-testsuite/system/linux -%dir %{_datadir}/sblim-testsuite/test-cmpi-base.sh +%{_datadir}/sblim-testsuite/test-cmpi-base.sh %{_datadir}/sblim-testsuite/cim/*.cim %{_datadir}/sblim-testsuite/system/linux/*.system %{_datadir}/sblim-testsuite/system/linux/*.sh @@ -179,6 +182,10 @@ fi %postun -p /sbin/ldconfig %changelog +* Mon Jun 17 2013 Vitezslav Crhonek - 1.6.2-4 +- Fix wrong UserModeTime and KernelModeTime +- Fix bogus date in %%changelog + * Thu Jun 06 2013 Vitezslav Crhonek - 1.6.2-3 - Fix incorrect max cpu frequency @@ -262,7 +269,7 @@ fi * Thu Nov 10 2005 - 1.5.4-3 - suppress error output in post scriptlets -* Wed Oct 27 2005 - 1.5.4-2 +* Wed Oct 26 2005 - 1.5.4-2 - went back to original provider dir location as FC5 pegasus 2.5.1 support /usr/lib[64]/cmpi