From 988d1498c3c7982962a6a1ec5aba8affb5b6276dd71eda619a2ba4b87087796b Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 31 Aug 2015 10:52:05 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=93 --- doxygen.changes | 5 ----- doxygen.spec | 12 ++++++++++++ doxywizard.changes | 5 ----- doxywizard.spec | 12 ------------ 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/doxygen.changes b/doxygen.changes index a57e1b6..3b41e8c 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Aug 27 07:34:04 UTC 2015 - mpluskal@suse.com - -- Move checks to doxywizard package to avoid build cycle - ------------------------------------------------------------------- Fri Aug 21 09:41:39 UTC 2015 - tchvatal@suse.com diff --git a/doxygen.spec b/doxygen.spec index 25d8854..a06173b 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -40,6 +40,11 @@ BuildRequires: gcc-c++ BuildRequires: python-base BuildRequires: python-xml BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 +# for make tests +BuildRequires: libxml2-tools +BuildRequires: texlive-bibtex +%endif %description Doxygen is a documentation system for C, C++, Java, and IDL. It can @@ -74,6 +79,13 @@ make %{?_smp_mflags} mkdir -p %{buildroot}%{_mandir}/man1/ install -m 644 doc/doxygen.1 %{buildroot}%{_mandir}/man1/ +%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 +%check +pushd build +make tests %{?_smp_mflags} +popd +%endif + %files %defattr(-,root,root) %doc LICENSE diff --git a/doxywizard.changes b/doxywizard.changes index 239af06..6db72cc 100644 --- a/doxywizard.changes +++ b/doxywizard.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Aug 27 07:34:32 UTC 2015 - mpluskal@suse.com - -- Move checks to doxywizard package to avoid build cycle - ------------------------------------------------------------------- Fri Aug 21 09:42:05 UTC 2015 - tchvatal@suse.com diff --git a/doxywizard.spec b/doxywizard.spec index aa19b5b..683a153 100644 --- a/doxywizard.spec +++ b/doxywizard.spec @@ -39,11 +39,6 @@ BuildRequires: libqt4-devel >= 4.3 BuildRequires: update-desktop-files Requires: doxygen = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 -# for make tests -BuildRequires: libxml2-tools -BuildRequires: texlive-bibtex -%endif %description Doxywizard is a graphical front-end to read/edit/write doxygen @@ -64,13 +59,6 @@ export CXXFLAGS="%{optflags} -fPIC" -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" make %{?_smp_mflags} -%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 -%check -pushd build -make tests %{?_smp_mflags} -popd -%endif - %install %cmake_install rm %{buildroot}%{_bindir}/doxygen