- make sure the build uses PLD CXXFLAGS, rel 5

diff --git a/fwbuilder.spec b/fwbuilder.spec
index f6aadf118c646efc91283f6e9649269845eb2223..1e7ac49994516a973dd70c02ce356fc047753aac 100644 (file)
--- a/fwbuilder.spec
+++ b/fwbuilder.spec
@@ -5,7 +5,7 @@ Summary:        Firewall Builder
 Summary(pl.UTF-8):     Narzędzie do tworzenia firewalli
 Name:          fwbuilder
 Version:       %{_majver}.%{_minver}.0.3599
-Release:       4
+Release:       5
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/fwbuilder/%{name}-%{version}.tar.gz
@@ -15,6 +15,7 @@ Source2:      %{name}.png
 Patch0:                %{name}-configure.patch
 Patch1:                %{name}-c++.patch
 Patch2:                %{name}-dont-mess-with-compiler-names-and-ccache.patch
+Patch3:                opt.patch
 URL:           http://www.fwbuilder.org/
 BuildRequires: QtCore-devel >= 4.3
 BuildRequires: QtDBus-devel >= 4.3
@@ -210,17 +211,22 @@ Pliki specyficzne dla MacOS X.
 #%patch0 -p1
 %patch1 -p1
 #%patch2 -p1
+%patch3 -p1
 
 %build
 export QTDIR="%{_usr}"
 export QMAKESPEC="%{_datadir}/qt4/mkspecs/linux-g++"
+export OPTFLAGS="%{rpmcxxflags} -std=c++11"
+export CXXFLAGS="%{rpmcxxflags} -std=c++11"
 
 cp -f /usr/share/automake/config.* .
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %configure \
        --with-templatedir=%{_datadir}/fwbuilder \
        --with-qmake=qmake-qt4
+
 %{__make}
 
 %install

diff --git a/opt.patch b/opt.patch
new file mode 100644 (file)
index 0000000..175ebb9
--- /dev/null
+++ b/opt.patch
@@ -0,0 +1,17 @@
+--- fwbuilder-5.1.0.3599/qmake.inc.in~ 2012-03-23 07:10:54.000000000 +0100
++++ fwbuilder-5.1.0.3599/qmake.inc.in  2021-10-24 21:40:34.809627661 +0200
+@@ -35,10 +35,10 @@
+     MOC_DIR = .moc
+     OBJECTS_DIR = .obj
+ 
+-    QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
+-    QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
+-    QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
+-    QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
++    QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter $$(OPTFLAGS)
++    QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter $$(OPTFLAGS)
++    QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter $$(OPTFLAGS)
++    QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter $$(OPTFLAGS)
+ 
+     !macx {
+