SPECS: qt4.spec - cosmetics

[glen]

Author: glen                         Date: Wed Jun 20 23:49:40 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cosmetics

---- Files affected:
SPECS:
   qt4.spec (1.137 -> 1.138) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.137 SPECS/qt4.spec:1.138
--- SPECS/qt4.spec:1.137	Thu Jun 21 01:12:42 2007
+++ SPECS/qt4.spec	Thu Jun 21 01:49:34 2007
@@ -1169,21 +1169,19 @@
 LD_LIBRARY_PATH=lib bin/lrelease translations/qt_pl.ts -qm translations/qt_pl.qm
 
 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:'`
-    [ "$lang" == "iw" ] && lang=he
-    MOD=qt4-$MOD
-    [ "$MOD" == "qt4-qt" ] && MOD=qt4
-    install -d $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES
-    cp $file $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES/$MOD.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:'`
+	[ "$lang" == "iw" ] && lang=he
+	MOD=qt4-$MOD
+	[ "$MOD" == "qt4-qt" ] && MOD=qt4
+	install -d $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
-for f in ../Qt{3Support,Assistant,Core,DBus,Designer,Gui,Network,OpenGL,Script,Sql,Svg,Test,UiTools,Xml}/*
-do
+for f in ../Qt{3Support,Assistant,Core,DBus,Designer,Gui,Network,OpenGL,Script,Sql,Svg,Test,UiTools,Xml}/*; do
 	if [ ! -d $f ]; then
 		ln -sf $f `basename $f`
 	fi
@@ -1216,7 +1214,7 @@
 # Prepare some files list
 ifecho() {
 	RESULT=`echo $RPM_BUILD_ROOT$2 2>/dev/null`
-	[ "$RESULT" == "" ] && return
+	[ "$RESULT" == "" ] && return # XXX this is never true due $RPM_BUILD_ROOT being set
 	r=`echo $RESULT | awk '{ print $1 }'`
 
 	if [ -d "$r" ]; then
@@ -1268,16 +1266,14 @@
 
 echo "%defattr(644,root,root,755)" > examples.files
 ifecho examples %{_examplesdir}/qt4
-for f in `find $RPM_BUILD_ROOT%{_examplesdir}/qt4 -printf "%%P "`
-do
+for f in `find $RPM_BUILD_ROOT%{_examplesdir}/qt4 -printf "%%P "`; do
 	ifecho examples %{_examplesdir}/qt4/$f
 done
 
 echo "%defattr(644,root,root,755)" > demos.files
 ifecho demos "%{_examplesdir}/qt4-demos"
 ifecho demos "%{_qtdir}/bin/qtdemo"
-for f in `find $RPM_BUILD_ROOT%{_examplesdir}/qt4-demos -printf "%%P "`
-do
+for f in `find $RPM_BUILD_ROOT%{_examplesdir}/qt4-demos -printf "%%P "`; do
 	ifecho demos %{_examplesdir}/qt4-demos/$f
 done
 
@@ -1286,7 +1282,8 @@
 
 %post	-n QtCore
 /sbin/ldconfig
-%banner -e %{name} <<-EOF
+if [ "$1" = 1 ]; then
+%banner -e %{name} <<'EOF'
  *******************************************************
  *                                                     *
  *  NOTE:                                              *
@@ -1296,6 +1293,8 @@
  *                                                     *
  *******************************************************
 EOF
+fi
+
 %postun	-n QtCore	-p /sbin/ldconfig
 
 %post	-n QtDBus	-p /sbin/ldconfig
@@ -1632,6 +1631,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.138  2007/06/20 23:49:34  glen
+- cosmetics
+
 Revision 1.137  2007/06/20 23:12:42  glen
 - more
 
================================================================

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