diff --git a/doxygen.changes b/doxygen.changes index 3488798..3d32cae 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Feb 21 00:48:27 UTC 2016 - crrodriguez@opensuse.org + +- Do not link with -pie if we are not compiling with -fPIE + ------------------------------------------------------------------- Tue Jan 5 07:31:22 UTC 2016 - foss@grueninger.de diff --git a/doxygen.spec b/doxygen.spec index e620654..660aa54 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -65,9 +65,9 @@ export CXXFLAGS="%{optflags} -fPIC" -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" + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" make %{?_smp_mflags} %install diff --git a/doxywizard.changes b/doxywizard.changes index f8b1d9d..3c98dcf 100644 --- a/doxywizard.changes +++ b/doxywizard.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Feb 21 00:41:56 UTC 2016 - crrodriguez@opensuse.org + +- Build against QT5 in newer products +- Do not link with -pie as we are not compiling with -fPIE + ------------------------------------------------------------------- Tue Jan 5 09:35:48 UTC 2016 - pgajdos@suse.com diff --git a/doxywizard.spec b/doxywizard.spec index 0b04136..4e3b295 100644 --- a/doxywizard.spec +++ b/doxywizard.spec @@ -32,7 +32,15 @@ BuildRequires: cmake >= 2.8.12 BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: libjpeg-devel +BuildRequires: python-xml +%if 0%{?suse_version} < 1320 BuildRequires: libqt4-devel >= 4.3 +%else +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Xml) +%endif BuildRequires: update-desktop-files Requires: doxygen = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -55,9 +63,9 @@ 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" + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" make %{?_smp_mflags} %if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315