SPECS (DEVEL): qt4.spec - locale & %files fixes - rel. .4

[twittner]

Author: twittner                     Date: Sat Apr 12 15:54:47 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- locale & %files fixes
- rel. .4

---- Files affected:
SPECS:
   qt4.spec (1.157.2.18 -> 1.157.2.19) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.157.2.18 SPECS/qt4.spec:1.157.2.19
--- SPECS/qt4.spec:1.157.2.18	Wed Apr  9 16:28:27 2008
+++ SPECS/qt4.spec	Sat Apr 12 17:54:42 2008
@@ -5,11 +5,6 @@
 #	- more cleanups
 #	- check if translations are available
 #	- check Qt ui tool
-#error: qt4-assistant-4.4.0-0.rc1.1: req /usr/share/locale/adp_de/LC_MESSAGES not found
-#error: qt4-assistant-4.4.0-0.rc1.1: req /usr/share/locale/adp_ja/LC_MESSAGES not found
-#error: qt4-assistant-4.4.0-0.rc1.1: req /usr/share/locale/adp_pl/LC_MESSAGES not found
-#error: qt4-assistant-4.4.0-0.rc1.1: req /usr/share/locale/adp_zh_CN/LC_MESSAGES not found
-#error: qt4-assistant-4.4.0-0.rc1.1: req /usr/share/locale/adp_zh_TW/LC_MESSAGES not found
 #
 # Conditional build:
 %bcond_with	nas		# enable NAS audio support
@@ -40,7 +35,7 @@
 %define		_withsql	1
 %{!?with_sqlite3:%{!?with_sqlite:%{!?with_ibase:%{!?with_mysql:%{!?with_pgsql:%{!?with_odbc:%undefine _withsql}}}}}}
 
-%define		rel	3
+%define		rel	4
 Summary:	The Qt GUI application framework
 Summary(es.UTF-8):	Biblioteca para ejecutar aplicaciones GUI Qt
 Summary(pl.UTF-8):	Biblioteka Qt do tworzenia GUI
@@ -1312,12 +1307,11 @@
 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
 	[ ! -f $file ] && continue
-	lang=`echo $file | sed -r 's:.*/[a-zA-Z]*_(.*).qm:\1:'`
-	MOD=`echo $file | sed -r 's:.*/([a-zA-Z]*)_.*.qm:\1:'`
+	eval "`echo $file | sed -r 's:.*/([a-zA-Z]+(_[a-zA-Z]{3,}){0,1})_(((ja)_jp)|([a-z]{2}_[A-Z]{2,})|([a-z]{2}))\.qm$:MOD=\1 ; lang=\5\6\7:'`"
 	[ "$lang" == "iw" ] && lang=he
 	MOD=qt4-$MOD
 	[ "$MOD" == "qt4-qt" ] && MOD=qt4
-	install -d $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES
+	install	-d $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES
 	cp $file $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES/$MOD.qm
 done
 
@@ -1329,9 +1323,6 @@
 done
 cd -
 
-mv $RPM_BUILD_ROOT%{_datadir}/locale/ja_jp/LC_MESSAGES/qt4.qm \
-	$RPM_BUILD_ROOT%{_datadir}/locale/ja/LC_MESSAGES/qt4.qm
-
 # Ship doc & qmake stuff
 ln -s %{_docdir}/%{name}-doc $RPM_BUILD_ROOT%{_qtdir}/doc
 ln -s %{_datadir}/qt4/mkspecs $RPM_BUILD_ROOT%{_qtdir}/mkspecs
@@ -1665,10 +1656,10 @@
 %attr(755,root,root) %{_qtdir}/bin/qcollectiongenerator
 %attr(755,root,root) %{_qtdir}/bin/assistant
 %attr(755,root,root) %{_qtdir}/bin/assistant_adp
-%lang(de) %{_datadir}/locale/*de/LC_MESSAGES/qt4-assistant.qm
-%lang(ja) %{_datadir}/locale/*ja/LC_MESSAGES/qt4-assistant.qm
-%lang(pl) %{_datadir}/locale/*pl/LC_MESSAGES/qt4-assistant.qm
-%lang(zh_CN) %{_datadir}/locale/*_zh_*/LC_MESSAGES/qt4-assistant.qm
+%lang(de) %{_datadir}/locale/de/LC_MESSAGES/qt4-assistant*.qm
+%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/qt4-assistant*.qm
+%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/qt4-assistant*.qm
+%lang(zh_CN) %{_datadir}/locale/zh_*/LC_MESSAGES/qt4-assistant*.qm
 %{_desktopdir}/assistant-qt4.desktop
 #%{_pixmapsdir}/assistant-qt4.png
 
@@ -1898,6 +1889,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.157.2.19  2008-04-12 15:54:42  twittner
+- locale & %files fixes
+- rel. .4
+
 Revision 1.157.2.18  2008-04-09 14:28:27  shadzik
 - proper requirements in new -devel subpackages
 - sub-rel 3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qt4.spec?r1=1.157.2.18&r2=1.157.2.19&f=u