SPECS (AC-branch): qt4.spec - adapter was here

[glen]

Author: glen                         Date: Sat Mar  3 11:24:18 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- adapter was here

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

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.71.2.13 SPECS/qt4.spec:1.71.2.14
--- SPECS/qt4.spec:1.71.2.13	Fri Dec 29 00:25:25 2006
+++ SPECS/qt4.spec	Sat Mar  3 12:24:12 2007
@@ -81,8 +81,8 @@
 BuildRequires:	xft-devel
 BuildRequires:	xrender-devel
 BuildRequires:	zlib-devel
-BuildConflicts:	QtCore-devel < %{version}
 BuildConflicts:	QtCore < %{version}
+BuildConflicts:	QtCore-devel < %{version}
 Obsoletes:	qt-extensions
 Obsoletes:	qt-utils
 Conflicts:	kdelibs <= 8:3.2-0.030602.1
@@ -633,7 +633,7 @@
 This module provides classes for D-BUS support. D-BUS is an
 Inter-Process Communication (IPC) and Remote Procedure Calling (RPC)
 mechanism originally developed for Linux to replace existing and
-competing IPC solutions with one unified protocol. 
+competing IPC solutions with one unified protocol.
 
 %description -n QtDBus -l pl
 Ten moduł udostępnia klasy do obsługi D-BUS. D-BUS to mechanizm
@@ -991,7 +991,7 @@
 	-xshape"
 
 ##################################
-#      STATIC MULTI-THREAD       #
+#	  STATIC MULTI-THREAD	   #
 ##################################
 
 %if %{with static_libs}
@@ -1018,7 +1018,7 @@
 %endif
 
 ##################################
-#      SHARED MULTI-THREAD       #
+#	  SHARED MULTI-THREAD	   #
 ##################################
 
 OPT=" \
@@ -1109,7 +1109,7 @@
     [ "$lang" == "iw" ] && lang=he
     MOD=qt4-$MOD
     [ "$MOD" == "qt4-qt" ] && MOD=qt4
-    mkdir -p $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
 
@@ -1448,18 +1448,31 @@
 %{_qtdir}/doc
 
 %files -n QtCore-devel -f QtCore-devel.files
+%defattr(644,root,root,755)
 %files -n QtDBus-devel -f QtDBus-devel.files
+%defattr(644,root,root,755)
 %files -n QtDesigner-devel -f QtDesigner-devel.files
+%defattr(644,root,root,755)
 %files -n QtGui-devel -f QtGui-devel.files
+%defattr(644,root,root,755)
 %files -n QtNetwork-devel -f QtNetwork-devel.files
+%defattr(644,root,root,755)
 %files -n QtOpenGL-devel -f QtOpenGL-devel.files
+%defattr(644,root,root,755)
 %files -n QtSql-devel -f QtSql-devel.files
+%defattr(644,root,root,755)
 %files -n QtSvg-devel -f QtSvg-devel.files
+%defattr(644,root,root,755)
 %files -n QtTest-devel -f QtTest-devel.files
+%defattr(644,root,root,755)
 %files -n QtXml-devel -f QtXml-devel.files
+%defattr(644,root,root,755)
 %files -n Qt3Support-devel -f Qt3Support-devel.files
+%defattr(644,root,root,755)
 %files -n QtAssistant-devel -f QtAssistant-devel.files
+%defattr(644,root,root,755)
 %files -n QtUiTools-devel -f QtUiTools-devel.files
+%defattr(644,root,root,755)
 
 %if %{with static_libs}
 %files -n QtCore-static
@@ -1512,7 +1525,9 @@
 %endif
 
 %files demos -f demos.files
+%defattr(644,root,root,755)
 %files examples -f examples.files
+%defattr(644,root,root,755)
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -1520,6 +1535,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71.2.14  2007/03/03 11:24:12  glen
+- adapter was here
+
 Revision 1.71.2.13  2006/12/28 23:25:25  charles
 - sync with HEAD
 
@@ -1724,7 +1742,7 @@
 
 Revision 1.25  2005/06/23 10:28:51  pascalek
 - Release 0.rc1.0.3
-- %%files fixes
+- %files fixes
 
 Revision 1.24  2005/06/23 02:26:11  pascalek
 - Release 0.rc1.0.2
@@ -1745,7 +1763,7 @@
 - typos.
 
 Revision 1.19  2005/05/16 20:01:17  pluto
-- cosmetics, tabs, %%attr.
+- cosmetics, tabs, %attr.
 
 Revision 1.18  2005/05/16 14:54:39  djurban
 - typo
================================================================

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