Hello community, here is the log from the commit of package cmpi-pywbem-base for openSUSE:Factory checked in at 2016-02-22 08:57:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmpi-pywbem-base (Old) and /work/SRC/openSUSE:Factory/.cmpi-pywbem-base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmpi-pywbem-base" Changes: -------- --- /work/SRC/openSUSE:Factory/cmpi-pywbem-base/cmpi-pywbem-base.changes 2012-02-21 12:16:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cmpi-pywbem-base.new/cmpi-pywbem-base.changes 2016-02-22 08:57:42.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Feb 15 14:37:58 UTC 2016 - [email protected] + +- delete mkdir %{buildroot} from spec file +- add fdupes to spec file +- delete commented lines of code +- add '#!BuildIgnore: pywebm' instead of '+BuildRequires: -pywbem' + +------------------------------------------------------------------- +Wed Jun 24 07:49:02 UTC 2015 - [email protected] + +- fix SLE10 build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmpi-pywbem-base.spec ++++++ --- /var/tmp/diff_new_pack.2zwUyi/_old 2016-02-22 08:57:43.000000000 +0100 +++ /var/tmp/diff_new_pack.2zwUyi/_new 2016-02-22 08:57:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package cmpi-pywbem-base # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,102 +17,73 @@ Name: cmpi-pywbem-base -BuildRequires: cmpi-bindings-pywbem -BuildRequires: cmpi-provider-register -BuildRequires: python-devel -BuildRequires: sblim-sfcb -PreReq: /usr/sbin/cmpi-provider-register Version: 0.2.0 Release: 0 Summary: Base System Providers License: BSD-3-Clause Group: System/Management Url: http://omc-project.org -BuildArch: noarch Source0: %{name}-%{version}.tar.gz -Requires: python-pywbem, cmpi-bindings-pywbem, cim-server +BuildRequires: cmpi-bindings-pywbem +BuildRequires: cmpi-provider-register +BuildRequires: python-devel +BuildRequires: python-xml +BuildRequires: sblim-sfcb +Requires: cim-server +Requires: cmpi-bindings-pywbem +Requires: python-pywbem +Requires(pre): cmpi-provider-register BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1010 +BuildRequires: fdupes +BuildArch: noarch +%endif +%if 0%{?fedora} +#!BuildIgnore: pywebm +%endif +%if 0%{?suse_version} < 1130 +BuildRequires: python-m2crypto +%else +BuildRequires: python-M2Crypto +%endif %description Base System CIM Providers %prep -%setup +%setup -q %build python setup.py build %install # http://lists.opensuse.org/opensuse-packaging/2007-02/msg00005.html -%{__rm} -rf $RPM_BUILD_ROOT -%{__mkdir} $RPM_BUILD_ROOT -python setup.py install --prefix=%{_prefix} --root $RPM_BUILD_ROOT \ +python setup.py install --prefix=%{_prefix} --root %{buildroot} \ --install-lib=/usr/lib/pycim -O1 -%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/mof/%{name} -install *.{mof,reg} $RPM_BUILD_ROOT/usr/share/mof/%{name}/ +mkdir -p %{buildroot}%{_datadir}/mof/%{name} +install *.{mof,reg} %{buildroot}%{_datadir}/mof/%{name}/ +%if 0%{?suse_version} > 1010 +%fdupes %{buildroot}/%{_prefix} +%endif # END OF INSTALL %files %defattr(-,root,root,-) %dir /usr/lib/pycim /usr/lib/pycim/* -/usr/share/mof/%{name} +%{_datadir}/mof/%{name} %pre if [ $1 -gt 1 ]; then - /usr/sbin/cmpi-provider-register -r -x -d /usr/share/mof/%{name} + %{_sbindir}/cmpi-provider-register -r -x -d %{_datadir}/mof/%{name} fi -#if [ $1 -gt 1 ]; then -# if [ -x /usr/bin/peg-loadmof.sh ]; then -# peg-loadmof.sh -r -n root/cimv2 /usr/share/mof/%{name}/OMC_Base.mof -# peg-loadmof.sh -r -n root/PG_InterOp /usr/share/mof/%{name}/*-peg.reg -# fi -# if [ -x /usr/bin/sfcbrepos -a -d /var/lib/sfcb/stage ]; then -# %{__rm} /var/lib/sfcb/stage/regs/OMC_Base.sfcb.reg -# pushd /usr/share/mof/%{name}/ -# for i in *.mof; do -# %{__rm} -f /var/lib/sfcb/stage/mofs/root/cimv2/$i -# done -# popd -# /usr/bin/sfcbrepos -f -# fi -#fi %post -/usr/sbin/cmpi-provider-register -d /usr/share/mof/%{name} -#if [ -x /usr/bin/peg-loadmof.sh ]; then -# peg-loadmof.sh -n root/PG_InterOp /usr/share/mof/%{name}/*-peg.reg -# peg-loadmof.sh -n root/cimv2 /usr/share/mof/%{name}/OMC_Base.mof -#fi -#if [ -x /usr/bin/sfcbrepos -a -d /var/lib/sfcb/stage ]; then -# mkdir -p /var/lib/sfcb/stage/mofs/root/cimv2/ -# ln -sf /usr/share/mof/%{name}/*.mof /var/lib/sfcb/stage/mofs/root/cimv2/ -# %{__rm} -f /var/lib/sfcb/stage/mofs/root/cimv2/OMC_Base.mof -# ln -sf /usr/share/mof/%{name}/*.sfcb.reg /var/lib/sfcb/stage/regs/ -# /usr/bin/sfcbrepos -f -# /etc/init.d/sfcb condrestart -#fi +%{_sbindir}/cmpi-provider-register -d %{_datadir}/mof/%{name} %preun if [ "$1" = "0" ] ; then - /usr/sbin/cmpi-provider-register -r -d /usr/share/mof/%{name} + %{_sbindir}/cmpi-provider-register -r -d %{_datadir}/mof/%{name} fi -#if [ "$1" = "0" ] ; then -# if [ -x /usr/bin/peg-loadmof.sh ] ; then -# # last uninstall, not upgrade -# peg-loadmof.sh -r -n root/PG_InterOp /usr/share/mof/%{name}/*-peg.reg -# peg-loadmof.sh -r -n root/cimv2 /usr/share/mof/%{name}/OMC_Base.mof -# fi -# if [ -x /usr/bin/sfcbrepos -a -d /var/lib/sfcb/stage ]; then -# %{__rm} /var/lib/sfcb/stage/regs/OMC_Base.sfcb.reg -# pushd /usr/share/mof/%{name}/ -# for i in *.mof; do -# %{__rm} -f /var/lib/sfcb/stage/mofs/root/cimv2/$i -# done -# popd -# /usr/bin/sfcbrepos -f -# /etc/init.d/sfcb condrestart -# fi -#fi %changelog
