%build: drop --buildkey g++-4 (#1327360)
Turns out this only introduced *yet another* incompatible buildkey, and is used as a buildkey prefix only resulting in something silly like: g++-4 x86_64 linux g++-4 full-config So, drop this madness, and rely on patching only for now.
This commit is contained in:
parent
59915e4ad9
commit
7963cb35aa
10
qt.spec
10
qt.spec
@ -44,7 +44,7 @@ Summary: Qt toolkit
|
|||||||
Name: qt
|
Name: qt
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 4.8.7
|
Version: 4.8.7
|
||||||
Release: 16%{?dist}
|
Release: 17%{?dist}
|
||||||
|
|
||||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
||||||
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
|
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
|
||||||
@ -176,10 +176,6 @@ Patch90: qt-everywhere-opensource-src-4.8.6-system-clucene.patch
|
|||||||
Patch91: qt-everywhere-opensource-src-4.8.7-mips64.patch
|
Patch91: qt-everywhere-opensource-src-4.8.7-mips64.patch
|
||||||
|
|
||||||
# fix build issue(s) with gcc6
|
# fix build issue(s) with gcc6
|
||||||
%if 0%{?fedora}
|
|
||||||
%global buildkey -buildkey g++-4
|
|
||||||
#BuildRequires: gcc-c++ >= 4
|
|
||||||
%endif
|
|
||||||
Patch100: qt-everywhere-opensource-src-4.8.7-gcc6.patch
|
Patch100: qt-everywhere-opensource-src-4.8.7-gcc6.patch
|
||||||
|
|
||||||
# support alsa-1.1.x
|
# support alsa-1.1.x
|
||||||
@ -679,7 +675,6 @@ export LDFLAGS="$LDFLAGS $RPM_LD_FLAGS"
|
|||||||
export MAKEFLAGS="%{?_smp_mflags}"
|
export MAKEFLAGS="%{?_smp_mflags}"
|
||||||
|
|
||||||
./configure -v \
|
./configure -v \
|
||||||
%{?buildkey} \
|
|
||||||
-confirm-license \
|
-confirm-license \
|
||||||
-opensource \
|
-opensource \
|
||||||
-optimized-qmake \
|
-optimized-qmake \
|
||||||
@ -1369,6 +1364,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Apr 20 2016 Rex Dieter <rdieter@fedoraproject.org> - 1:4.8.7-17
|
||||||
|
- %%build: drop --buildkey g++-4 (#1327360)
|
||||||
|
|
||||||
* Sun Apr 17 2016 Rex Dieter <rdieter@fedoraproject.org> - 1:4.8.7-16
|
* Sun Apr 17 2016 Rex Dieter <rdieter@fedoraproject.org> - 1:4.8.7-16
|
||||||
- use epoch in -static Provides
|
- use epoch in -static Provides
|
||||||
- -devel-private: Provides: qt(4)-private-devel
|
- -devel-private: Provides: qt(4)-private-devel
|
||||||
|
Loading…
Reference in New Issue
Block a user