Hello community, here is the log from the commit of package cimple for openSUSE:Factory checked in at 2015-03-27 09:41:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cimple (Old) and /work/SRC/openSUSE:Factory/.cimple.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cimple" Changes: -------- --- /work/SRC/openSUSE:Factory/cimple/cimple.changes 2014-07-31 21:50:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cimple.new/cimple.changes 2015-03-27 09:41:16.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Mar 19 08:57:27 UTC 2015 - [email protected] + +- merge with cimple-pegasus, build tog-pegasus specifics now + add install-cimlisten.patch + +- split off brevity, pegasus-adapter, and cmpi-adapter + as sub-packages + +------------------------------------------------------------------- New: ---- install-cimlisten.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cimple.spec ++++++ --- /var/tmp/diff_new_pack.wNkBcT/_old 2015-03-27 09:41:16.000000000 +0100 +++ /var/tmp/diff_new_pack.wNkBcT/_new 2015-03-27 09:41:16.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package cimple # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,9 +29,12 @@ Patch2: %{name}-%{version}-gcc.patch Patch3: aarch64-support.patch Patch4: ppc64le-support.patch +# enable installation of cimlisten tool, [email protected] +Patch5: install-cimlisten.patch BuildRequires: gcc-c++ BuildRequires: konkretcmpi BuildRequires: sblim-cmpi-devel +BuildRequires: tog-pegasus-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -52,7 +55,16 @@ (2) provide a foundation for implementing CIM-based standards such as WBEM, SMASH, WSDM, and WS Management. -%if 0 +%package cmpi-adapter +Summary: CMPI Adapter for CIMPLE providers +Group: System/Management +Requires: %{name} = %{version} + +%description cmpi-adapter +The CMPI Adapter for CIMPLE is a bridge between the universal CMPI +provider interface and CIMPLE providers. Using this adapter, +CIMPLE providers can run under any CIMOM. + %package pegasus-adapter Summary: Pegasus Adapter for CIMPLE providers Group: System/Management @@ -63,7 +75,16 @@ C++ provider interface and CIMPLE providers. Using this adapter, CIMPLE providers can run under Pegasus without using the CMPI layer. -%endif +%package -n brevity +Summary: Pegasus Client SDK +Group: System/Management +Requires: %{name} = %{version} +Requires: %{name}-devel = %{version} +Requires: %{name}-pegasus-adapter = %{version} +Requires: tog-pegasus-devel + +%description -n brevity +Brevity is a software development kit for Pegasus (tog-pegasus) clients %if 0 %package openwbem-adapter @@ -89,18 +110,6 @@ cimple-openwbem-adapter. This header is only needed by the module.cpp file (part of a CIMPLE provider). -%package pegasus-devel -Summary: Static library for CIMPLE providers using the Pegasus Adapter -Group: System/Management -Requires: %{name} = %{version} -Requires: %{name}-devel = %{version} -Requires: %{name}-pegasus-adapter = %{version} -Requires: pegasus-devel - -%description pegasus-devel -Static library for building CIMPLE providers that -will use the cimple-pegasus-adapter. - %endif %prep @@ -109,15 +118,16 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build export CIMPLE_DEBUG=1 ./configure \ + --bindir=%{_bindir} \ --libdir=%{_libdir} \ --prefix=%{_prefix} \ - --with-cmpi=/usr/include/cmpi - -# --with-pegasus=/usr \ + --with-cmpi=/usr/include/cmpi \ + --with-pegasus=/usr # --with-openwbem=/usr make FLAGS="%{optflags} -fno-strict-aliasing -fPIC" %{?_smp_mflags} @@ -139,44 +149,39 @@ %files %defattr(-, root, root) %{_bindir}/* -#%{_libdir}/libbrevity.so -%{_libdir}/libcimple.so* -%{_libdir}/libcimplecmpiadap.so* -# skip libcimpleowadap.so* -# skip libcimplepegadap.so* +%{_libdir}/libcimple.so %files devel %defattr(-, root, root) %dir %{_includedir}/%{name} -#%{_includedir}/brevity %{_includedir}/%{name}/[a-z]* %{_includedir}/%{name}/[A-N]* # skip OpenWBEM_Adapter.h %{_includedir}/%{name}/Ops.h %{_includedir}/%{name}/[P-Z]* -#%{_libdir}/libcimple_s.a -#%{_libdir}/libcimple[a-n]*_s.a -# skip %{_prefix}/lib/libcimpleowadap_s.a -# skip %{_prefix}/lib/libcimplepegadap_s.a -#%{_libdir}/libcimple[q-z]*_s.a - -#%files openwbem-adapter -#%defattr(-, root, root) -#%{_libdir}/libcimpleowadap.so* - -#%files openwbem-devel -#%defattr(-, root, root) -##%{_libdir}/libcimpleowadap_s.a -#%{_includedir}/%{name}/OpenWBEM_Adapter.h - -#%files pegasus-adapter -#%defattr(-, root, root) -#%{_libdir}/libcimplepegadap.so* %if 0 -%files pegasus-devel +%files openwbem-adapter +%defattr(-, root, root) +%{_libdir}/libcimpleowadap.so + +%files openwbem-devel %defattr(-, root, root) -#%{_libdir}/libcimplepegadap_s.a +%{_includedir}/%{name}/OpenWBEM_Adapter.h %endif +%files cmpi-adapter +%defattr(-, root, root) +%{_libdir}/libcimplecmpiadap.so + +%files pegasus-adapter +%defattr(-, root, root) +%{_libdir}/libcimplepegadap.so + +%files -n brevity +%defattr(-, root, root) +%dir %{_prefix}/include/brevity +%{_prefix}/include/brevity/* +%{_libdir}/libbrevity.so + %changelog ++++++ install-cimlisten.patch ++++++ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile.in ../orig-cimple-2.0.24/src/pegasus/cimlisten/Makefile ./src/pegasus/cimlisten/Makefile --- ../orig-cimple-2.0.24/src/pegasus/cimlisten/Makefile 2011-11-07 22:00:07.000000000 +0100 +++ ./src/pegasus/cimlisten/Makefile 2012-11-23 22:13:39.994824129 +0100 @@ -3,7 +3,7 @@ ## Remove the comment on the INSTALL variable assignment to install ## this utility -#INSTALL=1 +INSTALL=1 BINARY = cimlisten -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
