From 18f3d1f6121b7fe5e8e24d099bad120a8614c6c81f9c4fa6ba54c4ed8db84eca Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 4 Sep 2015 16:35:03 +0000 Subject: [PATCH] - Move checks to doxywizard package to avoid build cycle - Move checks to doxywizard package to avoid build cycle OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=94 --- doxygen.changes | 5 +++++ doxygen.spec | 12 ------------ doxywizard.changes | 5 +++++ doxywizard.spec | 14 ++++++++++++++ 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/doxygen.changes b/doxygen.changes index 3b41e8c..a57e1b6 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 a06173b..25d8854 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -40,11 +40,6 @@ 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 @@ -79,13 +74,6 @@ 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 6db72cc..239af06 100644 --- a/doxywizard.changes +++ b/doxywizard.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 683a153..76afcc4 100644 --- a/doxywizard.spec +++ b/doxywizard.spec @@ -39,6 +39,11 @@ 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 @@ -59,6 +64,15 @@ 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 +# testing doxygen package here to avoid build +# cycle between latex and doxygen +pushd build +make tests %{?_smp_mflags} +popd +%endif + %install %cmake_install rm %{buildroot}%{_bindir}/doxygen