Hello community, here is the log from the commit of package fwbuilder for openSUSE:Factory checked in at 2018-02-13 10:29:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fwbuilder (Old) and /work/SRC/openSUSE:Factory/.fwbuilder.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fwbuilder" Tue Feb 13 10:29:35 2018 rev:16 rq:575529 version:5.3.7 Changes: -------- --- /work/SRC/openSUSE:Factory/fwbuilder/fwbuilder.changes 2017-12-15 14:06:34.493171096 +0100 +++ /work/SRC/openSUSE:Factory/.fwbuilder.new/fwbuilder.changes 2018-02-13 10:29:36.716642802 +0100 @@ -1,0 +2,7 @@ +Wed Jan 31 14:04:30 UTC 2018 - [email protected] + +- Add fwbuilder-qmake-without-flags.patch: Fix build in case qmake + is started without QMAKE_CXXFLAGS being defined + (gh#fwbuilder/fwbuilder#46). + +------------------------------------------------------------------- New: ---- fwbuilder-qmake-without-flags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fwbuilder.spec ++++++ --- /var/tmp/diff_new_pack.vsVJwN/_old 2018-02-13 10:29:38.188589765 +0100 +++ /var/tmp/diff_new_pack.vsVJwN/_new 2018-02-13 10:29:38.192589621 +0100 @@ -1,7 +1,7 @@ # # spec file for package fwbuilder # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,7 @@ Group: Productivity/Networking/Security Url: http://www.fwbuilder.org/ Source: https://github.com/fwbuilder/fwbuilder/archive/v%{version}.tar.gz +Patch0: fwbuilder-qmake-without-flags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -55,10 +56,10 @@ independent of another. %prep -%setup -q -n %{name}-%{version} +%autosetup -p1 %build -./autogen.sh "--with-qmake=qmake-qt5" +NOCONFIGURE=1 ./autogen.sh "--with-qmake=qmake-qt5" %configure \ --with-qmake=qmake-qt5 \ --with-docdir=%{_docdir}/%{name} ++++++ fwbuilder-qmake-without-flags.patch ++++++ diff --git a/autogen.sh b/autogen.sh index 6d8c4969..da2f79f0 100755 --- a/autogen.sh +++ b/autogen.sh @@ -48,4 +48,4 @@ which acinclude >/dev/null 2>&1 && acinclude which aclocal >/dev/null 2>&1 && aclocal autoconf -./configure ${CFGARGS} $* +test -n "$NOCONFIGURE" || ./configure ${CFGARGS} $* diff --git a/runqmake.sh b/runqmake.sh index 7db4571b..8fb8958e 100755 --- a/runqmake.sh +++ b/runqmake.sh @@ -13,5 +13,10 @@ IFS=" test -z "$EXTRA_CXXFLAGS" || FLAGS="QMAKE_CXXFLAGS += $EXTRA_CXXFLAGS" -$QMAKE "$FLAGS" $C +if [ -z "$FLAGS" ]; then + # in case there are no FLAGS defined, we can't pass an empty "" parameter to qmake + $QMAKE $C +else + $QMAKE "$FLAGS" $C +fi
