Author: glen Date: Tue Feb 23 16:03:29 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- make -buildkey value override builtin
- remove ccache from resulting qmake files
- rel 7
---- Files affected:
packages/qt:
qt.spec (1.401 -> 1.402)
---- Diffs:
================================================================
Index: packages/qt/qt.spec
diff -u packages/qt/qt.spec:1.401 packages/qt/qt.spec:1.402
--- packages/qt/qt.spec:1.401 Wed Feb 17 10:52:59 2010
+++ packages/qt/qt.spec Tue Feb 23 17:03:21 2010
@@ -28,7 +28,7 @@
Summary(pt_BR.UTF-8): Estrutura para rodar aplicações GUI Qt
Name: qt
Version: %{ver}
-Release: 6
+Release: 7
Epoch: 6
License: QPL v1, GPL v2 or GPL v3
Group: X11/Libraries
@@ -97,6 +97,7 @@
Patch16: %{name}-fvisibility.patch
Patch17: qtkdeintegration.patch
Patch18: qt3-png14.patch
+Patch19: qt-buildkey-fixed.patch
URL: http://www.trolltech.com/products/qt/
%{?with_ibase:BuildRequires: Firebird-devel >= 1.5.0}
BuildRequires: OpenGL-GLU-devel
@@ -742,6 +743,7 @@
%patch16 -p0
%patch17 -p0
%patch18 -p1
+%patch19 -p1
# copy qt kde integration files
cp %{SOURCE8} %{SOURCE9} src/kernel
@@ -792,7 +794,8 @@
-DUSE_LIB64_PATHES \
%endif
-DQT_CLEAN_NAMESPACE \
- -buildkey pld \
+ -release \
+ -buildkey pld-linux \
-verbose \
-prefix %{_prefix} \
-libdir %{_libdir} \
@@ -1036,10 +1039,13 @@
mv $RPM_BUILD_ROOT{%{_libdir}/*.prl,%{_examplesdir}/%{name}/lib}
-# From now QMAKE_INCDIR_QT becomes %{_includedir}/qt
-perl -pi -e "
- s|(QMAKE_INCDIR_QT\\s*=\\s*\\\$\\(QTDIR\\)/include)|\$1/qt|
- " $RPM_BUILD_ROOT%{_datadir}/qt/mkspecs/linux-g++/qmake.conf
+%{__sed} -i -e '
+ # From now QMAKE_INCDIR_QT becomes %{_includedir}/qt
+ s|\(QMAKE_INCDIR_QT\s*=\s*\$(QTDIR)/include\)|\1/qt|
+ # Remove ccache if any
+ /QMAKE_\(CC\|CXX\|LINK\)/s|ccache ||;
+' $RPM_BUILD_ROOT%{_datadir}/qt/mkspecs/linux-g++/qmake.conf
+rm $RPM_BUILD_ROOT%{_datadir}/qt/mkspecs/linux-g++/qmake.conf.orig
# We provide qt style classes as plugins,
# so make corresponding changes to the qconfig.h.
@@ -1342,6 +1348,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.402 2010/02/23 16:03:21 glen
+- make -buildkey value override builtin
+- remove ccache from resulting qmake files
+- rel 7
+
Revision 1.401 2010/02/17 09:52:59 glen
- package all locale files
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt/qt.spec?r1=1.401&r2=1.402&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
