diff --git a/sblim-gather.spec b/sblim-gather.spec index 63914cf..548e32c 100644 --- a/sblim-gather.spec +++ b/sblim-gather.spec @@ -4,7 +4,7 @@ Name: sblim-gather Version: 2.2.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SBLIM Gatherer Group: Applications/System @@ -14,7 +14,6 @@ Source0: http://downloads.sourceforge.net/project/sblim/%{name}/%{version Source1: gather-config.h.prepend Source2: gather-config.h Source3: sblim-gather.tmpfiles -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sblim-cmpi-devel BuildRequires: sblim-cmpi-base-devel @@ -84,7 +83,6 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # remove unused libtool files rm -f $RPM_BUILD_ROOT/%{_libdir}/*a @@ -106,11 +104,7 @@ install -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_includedir}/gather/ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf -%clean -rm -rf $RPM_BUILD_ROOT - %files -%defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/*.conf %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf %config(noreplace) %{_sysconfdir}/init.d/gatherer @@ -128,7 +122,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/gather/rplug %files provider -%defattr(-,root,root,-) %{_libdir}/gather/cplug %{_libdir}/libOSBase_MetricUtil.so %{_libdir}/libOSBase*.so.* @@ -136,19 +129,17 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name} %files devel -%defattr(-,root,root,-) %{_libdir}/lib[^O]*.so %{_includedir}/gather %files test -%defattr(-,root,root,-) %{_datadir}/sblim-testsuite/cim/Linux* %{_datadir}/sblim-testsuite/system/linux/Linux* %{_datadir}/sblim-testsuite/system/linux/gather-systemname.sh %{_datadir}/sblim-testsuite/test-gather.sh -%define GATHER_SCHEMA %{_datadir}/%{name}/Linux_Metric.mof %{_datadir}/%{name}/Linux_IPProtocolEndpointMetric.mof %{_datadir}/%{name}/Linux_LocalFileSystemMetric.mof %{_datadir}/${name}/Linux_NetworkPortMetric.mof %{_datadir}/%{name}/Linux_OperatingSystemMetric.mof %{_datadir}/%{name}/Linux_ProcessorMetric.mof %{_datadir}/%{name}/Linux_UnixProcessMetric.mof %{_datadir}/%{name}/Linux_XenMetric.mof %{_datadir}/%{name}/Linux_zECKDMetric.mof %{_datadir}/%{name}/Linux_zCECMetric.mof %{_datadir}/%{name}/Linux_zLPARMetric.mof %{_datadir}/%{name}/Linux_zCHMetric.mof -%define GATHER_REGISTRATION %{_datadir}/%{name}/Linux_IPProtocolEndpointMetric.registration %{_datadir}/%{name}/Linux_LocalFileSystemMetric.registration %{_datadir}/%{name}/Linux_Metric.registration %{_datadir}/%{name}/Linux_NetworkPortMetric.registration %{_datadir}/%{name}/Linux_OperatingSystemMetric.registration %{_datadir}/%{name}/Linux_ProcessorMetric.registration %{_datadir}/%{name}/Linux_UnixProcessMetric.registration %{_datadir}/%{name}/Linux_XenMetric.registration %{_datadir}/%{name}/Linux_zECKDMetric.registration %{_datadir}/%{name}/Linux_zCECMetric.registration %{_datadir}/%{name}/Linux_zLPARMetric.registration %{_datadir}/%{name}/Linux_zCHMetric.registration +%global GATHER_SCHEMA %{_datadir}/%{name}/Linux_Metric.mof %{_datadir}/%{name}/Linux_IPProtocolEndpointMetric.mof %{_datadir}/%{name}/Linux_LocalFileSystemMetric.mof %{_datadir}/${name}/Linux_NetworkPortMetric.mof %{_datadir}/%{name}/Linux_OperatingSystemMetric.mof %{_datadir}/%{name}/Linux_ProcessorMetric.mof %{_datadir}/%{name}/Linux_UnixProcessMetric.mof %{_datadir}/%{name}/Linux_XenMetric.mof %{_datadir}/%{name}/Linux_zECKDMetric.mof %{_datadir}/%{name}/Linux_zCECMetric.mof %{_datadir}/%{name}/Linux_zLPARMetric.mof %{_datadir}/%{name}/Linux_zCHMetric.mof +%global GATHER_REGISTRATION %{_datadir}/%{name}/Linux_IPProtocolEndpointMetric.registration %{_datadir}/%{name}/Linux_LocalFileSystemMetric.registration %{_datadir}/%{name}/Linux_Metric.registration %{_datadir}/%{name}/Linux_NetworkPortMetric.registration %{_datadir}/%{name}/Linux_OperatingSystemMetric.registration %{_datadir}/%{name}/Linux_ProcessorMetric.registration %{_datadir}/%{name}/Linux_UnixProcessMetric.registration %{_datadir}/%{name}/Linux_XenMetric.registration %{_datadir}/%{name}/Linux_zECKDMetric.registration %{_datadir}/%{name}/Linux_zCECMetric.registration %{_datadir}/%{name}/Linux_zLPARMetric.registration %{_datadir}/%{name}/Linux_zCHMetric.registration %post install -d -m 0755 -o root -g root /var/run/gather @@ -190,6 +181,9 @@ fi %postun provider -p /sbin/ldconfig %changelog +* Thu Sep 06 2012 Vitezslav Crhonek - 2.2.6-2 +- Fix issues found by fedora-review utility in the spec file + * Wed Aug 15 2012 Vitezslav Crhonek - 2.2.6-1 - Update to sblim-gather-2.2.6