rpms/qt/devel qt.spec,1.316,1.317
Rex Dieter
rdieter at fedoraproject.org
Sun Aug 30 19:52:11 UTC 2009
- Previous message: rpms/wordpress/EL-5 .cvsignore, 1.24, 1.25 sources, 1.24, 1.25 wordpress.spec, 1.31, 1.32 changeset_r11798.diff, 1.1, NONE
- Next message: rpms/maxima/devel .cvsignore, 1.32, 1.33 maxima.spec, 1.137, 1.138 sources, 1.30, 1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26512
Modified Files:
qt.spec
Log Message:
* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-12
- use platform linux-g++ everwhere (ie, drop linux-g++-64 on 64 bit),
avoids plugin/linker weirdness described in bug #475110
Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -p -r1.316 -r1.317
--- qt.spec 26 Aug 2009 08:58:08 -0000 1.316
+++ qt.spec 30 Aug 2009 19:52:11 -0000 1.317
@@ -14,7 +14,7 @@ Epoch: 1
Name: qt4
%endif
Version: 4.5.2
-Release: 11%{?dist}
+Release: 12%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -401,11 +401,9 @@ Qt libraries used for drawing widgets an
# drop -fexceptions from $RPM_OPT_FLAGS
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
-## customize our platform
-%if "%{_lib}" == "lib64"
-%define platform linux-g++-64
-%else
%define platform linux-g++
+%if "%{_qt4_datadir}" != "%{_qt4_prefix}" && "%{_lib}" == "lib64"
+%define platform linux-g++-64
%endif
sed -i \
@@ -920,6 +918,10 @@ fi
%{_datadir}/icons/hicolor/*/apps/qt4-logo.*
%changelog
+* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-12
+- use platform linux-g++ everwhere (ie, drop linux-g++-64 on 64 bit),
+ avoids plugin/linker weirdness described in bug #475110
+
* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1:4.5.2-11
- rebuilt with new openssl
- Previous message: rpms/wordpress/EL-5 .cvsignore, 1.24, 1.25 sources, 1.24, 1.25 wordpress.spec, 1.31, 1.32 changeset_r11798.diff, 1.1, NONE
- Next message: rpms/maxima/devel .cvsignore, 1.32, 1.33 maxima.spec, 1.137, 1.138 sources, 1.30, 1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list