From 35d42b126fbdf8408fcae9cbbfecfd98558c669c42e07a4fa5c2edb2ae99706d Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 10 Jan 2020 09:34:16 +0000 Subject: [PATCH] Accepting request 762640 from home:pluskalm:branches:devel:tools - Use modern cmake macros - Use modern cmake macros OBS-URL: https://build.opensuse.org/request/show/762640 OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=144 --- doxygen.changes | 5 +++++ doxygen.spec | 9 ++++----- doxywizard.changes | 5 +++++ doxywizard.spec | 9 ++++----- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/doxygen.changes b/doxygen.changes index e3dff69..7d27992 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 10 09:14:20 UTC 2020 - Martin Pluskal + +- Use modern cmake macros + ------------------------------------------------------------------- Thu Jan 9 21:13:50 UTC 2020 - Christophe Giboudeaux diff --git a/doxygen.spec b/doxygen.spec index 5a7dd50..d4c7b9b 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -18,7 +18,6 @@ # build with "--with libclang" to enable libclang support %bcond_with libclang - Name: doxygen Version: 1.8.16 Release: 0 @@ -47,12 +46,12 @@ BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: python3-base BuildRequires: python3-xml -%if %{with libclang} -BuildRequires: llvm-clang-devel -%endif # Do not bother building documentation with latex since it is present on the # web trivialy for all versions of doxygen Obsoletes: doxygen-doc +%if %{with libclang} +BuildRequires: llvm-clang-devel +%endif %description Doxygen is a documentation system for C, C++, Java, and IDL. It can @@ -88,7 +87,7 @@ as well. -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ -DBUILD_SHARED_LIBS=OFF \ -DBUILD_STATIC_LIBS=ON -%make_jobs +%cmake_build %install %cmake_install diff --git a/doxywizard.changes b/doxywizard.changes index e64a4ed..5492975 100644 --- a/doxywizard.changes +++ b/doxywizard.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 10 09:14:32 UTC 2020 - Martin Pluskal + +- Use modern cmake macros + ------------------------------------------------------------------- Mon Sep 30 11:13:23 UTC 2019 - pgajdos@suse.com diff --git a/doxywizard.spec b/doxywizard.spec index 1a71a59..b157d66 100644 --- a/doxywizard.spec +++ b/doxywizard.spec @@ -35,14 +35,15 @@ BuildRequires: cmake >= 2.8.12 BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: libjpeg-devel +BuildRequires: pkgconfig BuildRequires: python3-base BuildRequires: python3-xml BuildRequires: update-desktop-files -Requires: doxygen = %{version} BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) +Requires: doxygen = %{version} %if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 # for make tests BuildRequires: libxml2-tools @@ -68,16 +69,14 @@ export CXXFLAGS="%{optflags} -fPIC" -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ -DBUILD_SHARED_LIBS=OFF \ -DBUILD_STATIC_LIBS=ON -%make_jobs +%cmake_build %if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 %check export LANG=C.UTF-8 # testing doxygen package here to avoid build # cycle between latex and doxygen -pushd build -make tests %{?_smp_mflags} -popd +%ctest %endif %install