Accepting request 326432 from home:scarabeus_iv:branches:devel:tools

- Set proper minimal cmake version required
- Use system stack for cmake params and obey cflags
- Add patch to build required static libs:
  * doxygen-no-shared-libs.patch
- Refresh patch:
  * doxygen-no-lowercase-man-names.patch
- Add patch to avoid no-return-in-nonvoid function error:
  * vhdlparser-no-return.patch

- Set proper minimal cmake version required
- Use system stack for cmake params and obey cflags
- Add patch to build required static libs:
  * doxygen-no-shared-libs.patch
- Refresh patch:
  * doxygen-no-lowercase-man-names.patch
- Add patch to avoid no-return-in-nonvoid function error:
  * vhdlparser-no-return.patch

- Set proper minimal cmake version required
- Use system stack for cmake params and obey cflags
- Add patch to build required static libs:
  * doxygen-no-shared-libs.patch
- Refresh patch:
  * doxygen-no-lowercase-man-names.patch
- Add patch to avoid no-return-in-nonvoid function error:
  * vhdlparser-no-return.patch

OBS-URL: https://build.opensuse.org/request/show/326432
OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=91

doxygen.spec

@@ -28,19 +28,23 @@ Source0:        http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar
 Patch0:         %{name}-modify_footer.patch
 # suse specific
 Patch1:         %{name}-no-lowercase-man-names.patch
+# PATCH-FIX-UPSTREAM: declare static library where we don't want to provide
+# shared one
+Patch2:         doxygen-no-shared-libs.patch
+# PATCH-FIX-UPSTREAM: add missing returns to non-void functions
+Patch3:         vhdlparser-no-return.patch
 BuildRequires:  bison
-BuildRequires:  cmake
+BuildRequires:  cmake >= 2.8.12
 BuildRequires:  flex
 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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Doxygen is a documentation system for C, C++, Java, and IDL. It can
@@ -51,24 +55,27 @@ developed on a Linux platform, but it runs on most other UNIX flavors
 as well.
 
 %prep
-%setup -q 
+%setup -q
 %patch0
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
-mkdir build
-pushd build
-cmake -G "Unix Makefiles"         \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr \
-      ..
-make  %{?_smp_mflags}
-popd
+export CFLAGS="%{optflags} -fPIC"
+export CXXFLAGS="%{optflags} -fPIC"
+%cmake \
+    -Dbuild_doc=OFF \
+    -Dbuild_xmlparser=ON \
+    -Dbuild_search=OFF \
+    -Dbuild_wizard=OFF \
+    -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \
+    -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \
+    -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now"
+make %{?_smp_mflags}
 
 %install
-pushd build
-make install %{?_smp_mflags}
-popd
+%cmake_install
 mkdir -p %{buildroot}%{_mandir}/man1/
 install -m 644 doc/doxygen.1 %{buildroot}%{_mandir}/man1/
 
@@ -82,7 +89,7 @@ popd
 %files
 %defattr(-,root,root)
 %doc LICENSE
-%attr(444,root,root) %doc %{_mandir}/man1/doxygen.1.gz
+%attr(444,root,root) %{_mandir}/man1/doxygen.1.gz
 %attr(755,root,root) %{_bindir}/*
 
 %changelog