Hello community, here is the log from the commit of package sblim-cmpi-devel for openSUSE:Factory checked in at Fri May 8 14:53:25 CEST 2009. -------- --- sblim-cmpi-devel/sblim-cmpi-devel.changes 2009-03-10 01:59:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/sblim-cmpi-devel/sblim-cmpi-devel.changes 2009-05-08 11:33:13.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 8 11:30:06 CEST 2009 - mc@suse.de + +- fix CmpiString +- add Doxygen file and create autodocs +- build and package c++ wrapper library + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- Doxyfile sblim-cmpi-devel-1.0.4-fix-string.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-cmpi-devel.spec ++++++ --- /var/tmp/diff_new_pack.A17232/_old 2009-05-08 14:51:54.000000000 +0200 +++ /var/tmp/diff_new_pack.A17232/_new 2009-05-08 14:51:54.000000000 +0200 @@ -21,14 +21,17 @@ Name: sblim-cmpi-devel Version: 2.0.1 -Release: 2 +Release: 3 Group: Development/Libraries/C and C++ Url: http://sblim.sf.net/ License: Eclipse Public License 1.0 -BuildRequires: gcc-c++ +BuildRequires: doxygen gcc-c++ Provides: cmpi-devel +Requires: libcmpiCppImpl0 Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 +Source1: Doxyfile Patch: %{name}.diff +Patch1: sblim-cmpi-devel-1.0.4-fix-string.dif %description This packages provides the C and C++ CMPI header files needed by @@ -38,26 +41,62 @@ +%package -n libcmpiCppImpl0 +License: Eclipse Public License 1.0 +Summary: SBLIM CMPI Provider Development Support +Group: Development/Libraries/C and C++ + +%description -n libcmpiCppImpl0 +This packages provides the C and C++ CMPI header files needed by +provider developers and can be used standalone. If used for C++ +provider development it is also necessary to have tog-pegasus-devel +installed. + + + %prep %setup -T -b 0 -n %{name}-%{version} %patch +%patch1 +cp %{_sourcedir}/Doxyfile %{_builddir}/%{name}-%{version}/ +mkdir %{_builddir}/%{name}-%{version}/autodocs %build -%configure --disable-library +%{suse_update_config -f} +autoreconf --verbose --force --install +%configure make %{?_smp_mflags} +doxygen Doxyfile %install make DESTDIR=$RPM_BUILD_ROOT install +rm -f $RPM_BUILD_ROOT/%{_libdir}/libcmpiCppImpl.a +rm -f $RPM_BUILD_ROOT/%{_libdir}/libcmpiCppImpl.la +mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}-%{version} +cp -r autodocs/ $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc %{_docdir}/%{name} +%doc %{_defaultdocdir}/%{name} %{_includedir}/cmpi +%{_libdir}/libcmpiCppImpl.so + +%files -n libcmpiCppImpl0 +%defattr(-,root,root) +%{_libdir}/libcmpiCppImpl.so.0* + +%post -n libcmpiCppImpl0 -p /sbin/ldconfig + +%postun -n libcmpiCppImpl0 -p /sbin/ldconfig %changelog +* Fri May 08 2009 mc@suse.de +- fix CmpiString +- add Doxygen file and create autodocs +- build and package c++ wrapper library * Tue Mar 10 2009 ro@suse.de - fix filelist * Fri Mar 06 2009 kkaempf@suse.de ++++++ Doxyfile ++++++ ++++ 1417 lines (skipped) ++++++ sblim-cmpi-devel-1.0.4-fix-string.dif ++++++ --- cmpi/CmpiString.h +++ cmpi/CmpiString.h 2009/01/14 09:15:43 @@ -70,6 +70,10 @@ /** Constructor - Empty string */ CmpiString(); + + /** Constructor - from const char* + */ + CmpiString(const char *s); /** Constructor - Copy constructor */ --- CmpiImpl.cpp +++ CmpiImpl.cpp 2009/01/14 08:59:23 @@ -891,8 +891,8 @@ CmpiData::CmpiData(const CmpiString& d) { _data.state=CMPI_goodValue; - _data.value.chars=(char*)d.charPtr(); - _data.type=CMPI_chars; + _data.value.string=d.getEnc(); + _data.type=CMPI_string; } CmpiData::CmpiData(const char* d) { @@ -1566,6 +1566,9 @@ CmpiString::CmpiString() { enc=NULL; } +CmpiString::CmpiString(const char *s) { + enc=CMNewString(CmpiProviderBase::getBroker(),s, NULL); +} const char* CmpiString::charPtr() const { if (getEnc()) return (const char*)getEnc()->hdl; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org