Hello community, here is the log from the commit of package sblim-cmpi-base for openSUSE:Factory checked in at 2015-06-24 20:56:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sblim-cmpi-base (Old) and /work/SRC/openSUSE:Factory/.sblim-cmpi-base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sblim-cmpi-base" Changes: -------- --- /work/SRC/openSUSE:Factory/sblim-cmpi-base/sblim-cmpi-base.changes 2014-12-03 22:48:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sblim-cmpi-base.new/sblim-cmpi-base.changes 2015-06-24 20:56:43.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Jun 23 10:36:54 UTC 2015 - [email protected] + +- cleanup spec file + * running spec cleaner + * install xml files with correct permission + * 'make' only with one thread + * remove sblim-cmpi-base-1.6.2-missing-fclose.patch as it is in upstream since git commit 3eb68295874453fdb1885489443105cb2ff6432d + +------------------------------------------------------------------- Old: ---- sblim-cmpi-base-1.6.2-missing-fclose.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-cmpi-base.spec ++++++ --- /var/tmp/diff_new_pack.akxeyb/_old 2015-06-24 20:56:43.000000000 +0200 +++ /var/tmp/diff_new_pack.akxeyb/_new 2015-06-24 20:56:43.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sblim-cmpi-base # -# 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 @@ -17,38 +17,30 @@ Name: sblim-cmpi-base -BuildRequires: gcc-c++ -BuildRequires: libtool -BuildRequires: sblim-cmpi-devel -BuildRequires: sblim-indication_helper-devel -BuildRequires: sblim-sfcb -BuildRequires: sblim-testsuite Version: 1.6.4 Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: cim-schema -Requires: cim-server +Summary: SBLIM Base Instrumentation +License: EPL-1.0 +Group: System/Management Url: http://sblim.wiki.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sblim-cmpi-base-rpmlintrc # PATCH-FEATURE-OPENSUSE sblim-cmpi-base-%{version}-methods-enable.patch [ bnc#470670 ] [email protected] -- Enables methods by default Patch0: sblim-cmpi-base-1.6.2-methods-enable.patch -# PATCH-FIX-UPSTREAM sblim-cmpi-base-%{version}-missing-fclose.patch [ bnc#530325 upstream#2843613 ] [email protected] -- Adding missing fclose -Patch1: sblim-cmpi-base-1.6.2-missing-fclose.patch Patch2: sblim-cmpi-base-1.6.4-fix-bashisms.patch -Summary: SBLIM Base Instrumentation -License: EPL-1.0 -Group: System/Management +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: sblim-cmpi-devel +BuildRequires: sblim-indication_helper-devel +BuildRequires: sblim-sfcb +BuildRequires: sblim-testsuite +Requires: cim-schema +Requires: cim-server +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Standards Based Linux Instrumentation Base Providers - - -Authors: --------- - SBLIM Project - %package devel Summary: SBLIM Base Instrumentation Header Development Files Group: Development/Libraries/C and C++ @@ -57,12 +49,6 @@ %description devel SBLIM Base Provider Development Package - - -Authors: --------- - SBLIM Project - %package testsuite Summary: SBLIM Base Instrumentation (test suite) Group: System/Management @@ -72,44 +58,36 @@ %description testsuite Test suite for the Standards Based Linux Instrumentation Base Providers - - -Authors: --------- - SBLIM Project - %prep -%setup -T -b 0 -n %{name}-%{version} +%setup -q -T -b 0 %patch0 -%patch1 %patch2 -p1 %build autoreconf -fi %configure TESTSUITEDIR=%{_datadir}/sblim-testsuite --disable-static -%{__make} +#Does not build with multiple threads +make -j1 %install %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=%{buildroot} install -j1 %else -%makeinstall docdir=%{_docdir}/%{name} +make DESTDIR=%{buildroot} install -j1 docdir=%{_docdir}/%{name} %endif # don't delete .la's until we sort out if sfcb/openwbem/pegasus use ltdlopen() # %{__rm} %{buildroot}%{_libdir}/{libcmpiOSBase_Common,libdmiinfo}.la # remove unused libtool files -rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a -rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*.a +rm -f %{buildroot}/%{_libdir}/*.a +rm -f %{buildroot}/%{_libdir}/cmpi/*.a rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*.la # install indication samples into %docdir -install ./test/indication/SFCB*.xml $RPM_BUILD_ROOT/%{_docdir}/%{name} - -%clean +install -m0644 ./test/indication/SFCB*.xml %{buildroot}/%{_docdir}/%{name} %pre # definition of schema and registration files + %define SCHEMA %{_datadir}/%{name}/Linux_Base.mof %{_datadir}/%{name}/Linux_BaseIndication.mof %define REGISTRATION %{_datadir}/%{name}/Linux_BaseIndication.registration # If upgrading, deregister old version @@ -122,8 +100,8 @@ %post # Register Schema and Provider - this is higly provider specific # tog-pegasus needs some schemes registered first -if [ -x /usr/bin/peg-loadmof.sh ]; then - peg-loadmof.sh -n root/cimv2 %(for i in Card UnixProcess Processor OperatingSystem ComputerSystem ComputerSystemPackage RunningOS OSProcess SystemDevice ProcessIndication ElementStatisticalData; echo -n "/usr/share/mof/cim-current/*/CIM_$i.mof ") +if [ -x %{_bindir}/peg-loadmof.sh ]; then + peg-loadmof.sh -n root/cimv2 %(for i in Card UnixProcess Processor OperatingSystem ComputerSystem ComputerSystemPackage RunningOS OSProcess SystemDevice ProcessIndication ElementStatisticalData; echo -n "%{_datadir}/mof/cim-current/*/CIM_$i.mof ") rctog-pegasus try-restart fi # and then following script can handle registration for various providers
