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

doxywizard.spec

@@ -25,15 +25,20 @@ Group:          Development/Tools/Doc Generators
 Url:            http://www.stack.nl/~dimitri/doxygen/
 Source:         http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz
 Source1:        doxywizard.desktop
+# 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:  libjpeg-devel
-Requires:       doxygen = %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  libqt4-devel >= 4.3
 BuildRequires:  update-desktop-files
+Requires:       doxygen = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Doxywizard is a graphical front-end to read/edit/write doxygen
@@ -41,22 +46,21 @@ configuration files.
 
 %prep
 %setup -q -n doxygen-%{version}
+%patch2 -p1
+%patch3 -p1
 
 %build
-mkdir build
-pushd build
-cmake -G "Unix Makefiles"         \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr \
-      -Dbuild_wizard=ON \
-      ..
+export CFLAGS="%{optflags} -fPIC"
+export CXXFLAGS="%{optflags} -fPIC"
+%cmake \
+    -Dbuild_wizard=ON \
+    -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}
-popd
 
 %install
-pushd build
-make install %{?_smp_mflags}
-popd
+%cmake_install
 rm %{buildroot}%{_bindir}/doxygen
 mkdir -p %{buildroot}%{_mandir}/man1/
 install -m 644 doc/doxywizard.1 %{buildroot}%{_mandir}/man1/