|
|
@@ -8,7 +8,7 @@ Summary: Qt toolkit
|
|
|
Summary(ja): Qt ツールキット
|
|
|
Name: qt4
|
|
|
Version: 4.8.3
|
|
|
-Release: 1%{?_dist_release}
|
|
|
+Release: 2%{?_dist_release}
|
|
|
|
|
|
# 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
|
|
|
@@ -437,9 +437,11 @@ RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
|
|
|
|
|
|
sed -i \
|
|
|
-e "s|-O2|$RPM_OPT_FLAGS|g" \
|
|
|
- -e "s|g++.conf|g++-multilib.conf|g" \
|
|
|
mkspecs/%{platform}/qmake.conf
|
|
|
|
|
|
+sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 $RPM_LD_FLAGS|" \
|
|
|
+ mkspecs/common/g++-unix.conf
|
|
|
+
|
|
|
# undefine QMAKE_STRIP, so we get useful -debuginfo pkgs
|
|
|
sed -i -e "s|^QMAKE_STRIP.*=.*|QMAKE_STRIP =|" mkspecs/common/linux.conf
|
|
|
|
|
|
@@ -1082,6 +1084,11 @@ fi
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Oct 28 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 4.8.3-2
|
|
|
+- fix mkspecs/%%{platform}/qmake.conf
|
|
|
+ - do not replace g++.conf with g++-multilib.conf.
|
|
|
+ g++-multilib.conf does not exist.
|
|
|
+
|
|
|
* Sat Sep 15 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.8.3-1
|
|
|
- new upstream release
|
|
|
- update Patch68 (webkit-qtwebkit-2.2-no_Werror.patch)
|
daisuke