SPECS: qt4.spec - rel 5; use sed instead of patch
arekm
arekm at pld-linux.org
Sun Mar 8 19:26:59 CET 2009
Author: arekm Date: Sun Mar 8 18:26:59 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- rel 5; use sed instead of patch
---- Files affected:
SPECS:
qt4.spec (1.196 -> 1.197)
---- Diffs:
================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.196 SPECS/qt4.spec:1.197
--- SPECS/qt4.spec:1.196 Sun Mar 8 15:55:10 2009
+++ SPECS/qt4.spec Sun Mar 8 19:26:53 2009
@@ -64,7 +64,7 @@
Summary(pt_BR.UTF-8): Estrutura para rodar aplicações GUI Qt
Name: qt4
Version: 4.5.0
-Release: 4
+Release: 5
License: LGPL v2.1 or GPL v3.0
Group: X11/Libraries
Source0: http://download.qtsoftware.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz
@@ -101,7 +101,6 @@
Patch8: %{name}-pl-update.patch
Patch9: %{name}-ibase.patch
Patch10: %{name}-ppc.patch
-Patch11: %{name}-ppc-hack.patch
# svn://anonsvn.kde.org/home/kde/trunk/qt-copy/patches
URL: http://www.qtsoftware.com/
%{?with_ibase:BuildRequires: Firebird-devel}
@@ -1431,7 +1430,7 @@
# hack for tools/qstring.cpp:2329: internal compiler error: in output_369, at config/rs6000/rs6000.md:11495
%ifarch ppc ppc64
-cat %{PATCH11} | patch -p1 || exit
+sed -i -e 's#qstring.o tools/qstring.cpp#qstring.o -O1 tools/qstring.cpp#g' src/corelib/Makefile
%endif
%{__make} -C src
@@ -1459,7 +1458,7 @@
echo "yes" | ./configure $COMMONOPT $OPT
%ifarch ppc ppc64
-cat %{PATCH11} | patch -p1 || exit
+sed -i -e 's#qstring.o tools/qstring.cpp#qstring.o -O1 tools/qstring.cpp#g' src/corelib/Makefile
%endif
%{__make}
@@ -2162,6 +2161,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.197 2009/03/08 18:26:53 arekm
+- rel 5; use sed instead of patch
+
Revision 1.196 2009/03/08 14:55:10 arekm
- apply ppc hack patch for shared, too
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qt4.spec?r1=1.196&r2=1.197&f=u
More information about the pld-cvs-commit
mailing list