SPECS (AC-branch): qt4.spec - sync with HEAD

charles charles at pld-linux.org
Fri Dec 29 00:25:30 CET 2006


Author: charles                      Date: Thu Dec 28 23:25:30 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- sync with HEAD

---- Files affected:
SPECS:
   qt4.spec (1.71.2.12 -> 1.71.2.13) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.71.2.12 SPECS/qt4.spec:1.71.2.13
--- SPECS/qt4.spec:1.71.2.12	Tue Dec 26 03:14:14 2006
+++ SPECS/qt4.spec	Fri Dec 29 00:25:25 2006
@@ -542,6 +542,10 @@
 Summary(pl):	Biblioteka kompatybilności z Qt3
 Group:		X11/Libraries
 Requires:	QtCore = %{version}-%{release}
+Requires:	QtGui = %{version}-%{release}
+Requires:	QtNetwork = %{version}-%{release}
+Requires:	QtSql = %{version}-%{release}
+Requires:	QtXml = %{version}-%{release}
 
 %description -n Qt3Support
 Qt3 compatibility library.
@@ -557,6 +561,7 @@
 Requires:	QtCore-devel = %{version}-%{release}
 Requires:	QtGui-devel = %{version}-%{release}
 Requires:	QtNetwork-devel = %{version}-%{release}
+Requires:	QtSql-devel = %{version}-%{release}
 Requires:	QtXml-devel = %{version}-%{release}
 
 %description -n Qt3Support-devel
@@ -1099,13 +1104,13 @@
 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:'`
+    lang=`echo $file | sed -r 's:.*/[a-zA-Z]*_(.*).qm:\1:'`
     MOD=`echo $file | sed -r 's:.*/([a-zA-Z]*)_.*.qm:\1:'`
-    [ "$LANG" == "iw" ] && LANG=he
+    [ "$lang" == "iw" ] && lang=he
     MOD=qt4-$MOD
     [ "$MOD" == "qt4-qt" ] && MOD=qt4
-    mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale/$LANG/LC_MESSAGES
-    cp $file $RPM_BUILD_ROOT%{_datadir}/locale/$LANG/LC_MESSAGES/$MOD.qm
+    mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES
+    cp $file $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES/$MOD.qm
 done
 
 cd $RPM_BUILD_ROOT%{_includedir}/qt4/Qt
@@ -1515,6 +1520,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71.2.13  2006/12/28 23:25:25  charles
+- sync with HEAD
+
 Revision 1.71.2.12  2006/12/26 02:14:14  charles
 - Qt3Support-devel R: {QtGui,QtNetwork,QtXml}-devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.71.2.12&r2=1.71.2.13&f=u



More information about the pld-cvs-commit mailing list