Author: qboosh Date: Fri Jan 4 17:09:37 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- don't replace existing Polish translation with outdated file; update by patch
instead
---- Files affected:
SPECS:
qt4.spec (1.153 -> 1.154)
---- Diffs:
================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.153 SPECS/qt4.spec:1.154
--- SPECS/qt4.spec:1.153 Fri Jan 4 16:21:54 2008
+++ SPECS/qt4.spec Fri Jan 4 18:09:32 2008
@@ -1,7 +1,6 @@
# $Revision$, $Date$
#
# TODO:
-# - fix ibase build with current Firebird on x86_64
# - better descriptions
# - more cleanups
# - check if translations are available
@@ -16,7 +15,7 @@
%bcond_without pgsql # don't build PostgreSQL plugin
%bcond_without sqlite3 # don't build SQLite3 plugin
%bcond_without sqlite # don't build SQLite2 plugin
-%bcond_with ibase # don't build ibase (InterBase/Firebird) plugin
+%bcond_without ibase # don't build ibase (InterBase/Firebird) plugin
%bcond_without pch # disable pch in qmake
%bcond_with sse # use SSE instructions in gui/painting module
%bcond_with sse2 # use SSE2 instructions
@@ -51,7 +50,6 @@
Source3: %{name}-designer.desktop
Source4: %{name}-assistant.desktop
Source5: %{name}-linguist.desktop
-Source6: %{name}_pl.ts
Patch0: %{name}-tools.patch
Patch1: %{name}-qt_copy.patch
Patch2: %{name}-buildsystem.patch
@@ -60,6 +58,7 @@
Patch5: %{name}-support-cflags-with-commas.patch
Patch6: %{name}-build-lib-static.patch
Patch7: %{name}-x11_fonts.patch
+Patch8: %{name}-pl-update.patch
URL: http://www.trolltech.com/products/qt/
%{?with_ibase:BuildRequires: Firebird-devel}
BuildRequires: OpenGL-GLU-devel
@@ -978,6 +977,7 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
mkspecs/common/linux.conf
@@ -1166,8 +1166,9 @@
#
# Locale
#
-cp %{SOURCE6} translations/qt_pl.ts
-LD_LIBRARY_PATH=lib bin/lrelease translations/qt_pl.ts -qm
translations/qt_pl.qm
+for f in translations/*_pl.ts ; do
+ LD_LIBRARY_PATH=lib bin/lrelease $f -qm translations/$(basename $f
.ts).qm
+done
rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*.qm
for file in translations/*.qm tools/assistant/*.qm
tools/designer/designer/*.qm tools/linguist/linguist/*.qm; do
@@ -1644,6 +1645,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.154 2008-01-04 17:09:32 qboosh
+- don't replace existing Polish translation with outdated file; update by
patch instead
+
Revision 1.153 2008-01-04 15:21:54 qboosh
- dropped banner:
- qt4 is parallel-installable with qt 3.x
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qt4.spec?r1=1.153&r2=1.154&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
