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
This commit is contained in:
Petr Gajdos 2020-01-10 09:34:16 +00:00 committed by Git OBS Bridge
parent cbc445d421
commit 35d42b126f
4 changed files with 18 additions and 10 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jan 10 09:14:20 UTC 2020 - Martin Pluskal <mpluskal@suse.com>
- Use modern cmake macros
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 9 21:13:50 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr> Thu Jan 9 21:13:50 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -18,7 +18,6 @@
# build with "--with libclang" to enable libclang support # build with "--with libclang" to enable libclang support
%bcond_with libclang %bcond_with libclang
Name: doxygen Name: doxygen
Version: 1.8.16 Version: 1.8.16
Release: 0 Release: 0
@ -47,12 +46,12 @@ BuildRequires: flex
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: python3-base BuildRequires: python3-base
BuildRequires: python3-xml BuildRequires: python3-xml
%if %{with libclang}
BuildRequires: llvm-clang-devel
%endif
# Do not bother building documentation with latex since it is present on the # Do not bother building documentation with latex since it is present on the
# web trivialy for all versions of doxygen # web trivialy for all versions of doxygen
Obsoletes: doxygen-doc Obsoletes: doxygen-doc
%if %{with libclang}
BuildRequires: llvm-clang-devel
%endif
%description %description
Doxygen is a documentation system for C, C++, Java, and IDL. It can 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" \ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \
-DBUILD_SHARED_LIBS=OFF \ -DBUILD_SHARED_LIBS=OFF \
-DBUILD_STATIC_LIBS=ON -DBUILD_STATIC_LIBS=ON
%make_jobs %cmake_build
%install %install
%cmake_install %cmake_install

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jan 10 09:14:32 UTC 2020 - Martin Pluskal <mpluskal@suse.com>
- Use modern cmake macros
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 30 11:13:23 UTC 2019 - pgajdos@suse.com Mon Sep 30 11:13:23 UTC 2019 - pgajdos@suse.com

View File

@ -35,14 +35,15 @@ BuildRequires: cmake >= 2.8.12
BuildRequires: flex BuildRequires: flex
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: pkgconfig
BuildRequires: python3-base BuildRequires: python3-base
BuildRequires: python3-xml BuildRequires: python3-xml
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
Requires: doxygen = %{version}
BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(Qt5Xml)
Requires: doxygen = %{version}
%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 %if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315
# for make tests # for make tests
BuildRequires: libxml2-tools BuildRequires: libxml2-tools
@ -68,16 +69,14 @@ export CXXFLAGS="%{optflags} -fPIC"
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \
-DBUILD_SHARED_LIBS=OFF \ -DBUILD_SHARED_LIBS=OFF \
-DBUILD_STATIC_LIBS=ON -DBUILD_STATIC_LIBS=ON
%make_jobs %cmake_build
%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 %if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315
%check %check
export LANG=C.UTF-8 export LANG=C.UTF-8
# testing doxygen package here to avoid build # testing doxygen package here to avoid build
# cycle between latex and doxygen # cycle between latex and doxygen
pushd build %ctest
make tests %{?_smp_mflags}
popd
%endif %endif
%install %install