Hello community, here is the log from the commit of package sblim-cmpi-smis-hba for openSUSE:Factory checked in at 2012-09-14 12:45:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sblim-cmpi-smis-hba (Old) and /work/SRC/openSUSE:Factory/.sblim-cmpi-smis-hba.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sblim-cmpi-smis-hba", Maintainer is "kkaempf@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sblim-cmpi-smis-hba/sblim-cmpi-smis-hba.changes 2012-06-01 07:24:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sblim-cmpi-smis-hba.new/sblim-cmpi-smis-hba.changes 2012-09-14 12:45:57.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Aug 12 10:21:25 UTC 2012 - kkaempf@suse.com + +- Fix CentOS 5,6 and RHEL 5,6 builds + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-cmpi-smis-hba.spec ++++++ --- /var/tmp/diff_new_pack.IY9jTj/_old 2012-09-14 12:46:17.000000000 +0200 +++ /var/tmp/diff_new_pack.IY9jTj/_new 2012-09-14 12:46:17.000000000 +0200 @@ -91,24 +91,23 @@ autoreconf -f -i -%if 0%{?suse_version} +# SLE 10 does not recognize --docdir +# and cannot parse || expressions :-/ + +%configure \ + CFLAGS="$RPM_OPT_FLAGS" \ + TESTSUITEDIR=%{_datadir}/sblim-testsuite \ + CIMSERVER=sfcb \ + PROVIDERDIR=%{_libdir}/cmpi \ %if 0%{?suse_version} > 1010 -%configure --docdir=%{_docdir}/%{name} \ + --docdir=%{_docdir}/%{name} %else -# no --docdir in SLE10 -%configure +%if 0%{?suse_version} == 0 +%if (0%{?rhel_version} >= 600) || (0%{?centos_version} >= 600) + --docdir=%{_docdir}/%{name}-%{version} %endif -%else -%if 0%{?rhel_version} != 501 -%configure --docdir=%{_docdir}/%{name}-%{version} \ -%else -%configure \ %endif %endif - CFLAGS="$RPM_OPT_FLAGS" \ - TESTSUITEDIR=%{_datadir}/sblim-testsuite \ - CIMSERVER=sfcb \ - PROVIDERDIR=%{_libdir}/cmpi make CFLAGS="-fno-strict-aliasing" RPM_OPT_FLAGS="$(RPM_OPT_FLAGS)" @@ -126,8 +125,8 @@ mkdir -p $RPM_BUILD_ROOT/usr/include/cmpi mkdir -p $RPM_BUILD_ROOT/usr/share/cmpi/mof -%if 0%{?rhel_version} != 501 -make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_lib} +%if 0%{?suse_version} +make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_lib} docdir=%{_docdir}/%{name} %else make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_lib} docdir=%{_docdir}/%{name}-%{version} %endif @@ -177,11 +176,7 @@ %defattr(-,root,root) #%doc %{_docdir}/%{name} #%defattr(-,root,root,0644) -%if 0%{?suse_version} %doc NEWS README AUTHORS -%else -%doc %{_docdir}/%{name}-%{version} -%endif #%doc %{_mandir}/man5/smt_smis-hba_ra_support.conf.5.gz #%config(noreplace) %{_sysconfdir}/smt_smis-hba*.conf %{cmpi_provider_dir}/*.so.* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org