Hello community, here is the log from the commit of package scap-workbench for openSUSE:Factory checked in at 2015-02-14 13:55:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scap-workbench (Old) and /work/SRC/openSUSE:Factory/.scap-workbench.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scap-workbench" Changes: -------- --- /work/SRC/openSUSE:Factory/scap-workbench/scap-workbench.changes 2015-01-14 11:45:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.scap-workbench.new/scap-workbench.changes 2015-02-14 13:56:00.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 5 08:52:56 UTC 2015 - kkae...@suse.com + +- Require libqt4-devel >= 4.8 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scap-workbench.spec ++++++ --- /var/tmp/diff_new_pack.bkERoY/_old 2015-02-14 13:56:01.000000000 +0100 +++ /var/tmp/diff_new_pack.bkERoY/_new 2015-02-14 13:56:01.000000000 +0100 @@ -26,8 +26,15 @@ Source: https://fedorahosted.org/released/scap-workbench/%{name}-%{version}.tar.bz2 BuildRequires: cmake BuildRequires: openscap-devel +# SLE 11 SP3: libopenscap needs libxslt without requiring it +# libxslt nees pcre +%if 0%{?suse_version} < 1140 +BuildRequires: libxslt-devel +BuildRequires: pcre-devel +%endif BuildRequires: pkg-config -BuildRequires: qt-devel +# QXmlQuery is in 4.8 and later +BuildRequires: libqt4-devel >= 4.8 BuildRequires: update-desktop-files %if 0%{?suse_version} >= 1140 BuildRequires: libwebkitgtk-devel @@ -57,9 +64,21 @@ %setup -q %build +%if 0%{?cmake} %cmake -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} -DCMAKE_INSTALL_LIBEXECDIR=%{_libdir}/%{name} - -make %{?jobs:-j%jobs} +%else +rm -rf build +mkdir build +(cd build; + cmake -DCMAKE_INSTALL_PREFIX=/usr\ + -DCMAKE_VERBOSE_MAKEFILE=TRUE\ + -DCMAKE_SKIP_RPATH=1\ + -DPACKAGE_ARCHITECTURE=`uname -m`\ + -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name}\ + -DCMAKE_INSTALL_LIBEXECDIR=%{_libdir}/%{name}\ + ..) +%endif +(cd build; make %{?jobs:-j%jobs}) %install (cd build; %make_install) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
