SPECS: qt4.spec - ac-branch merge - drop AC bcond

[glen]

Author: glen                         Date: Sat Mar  3 11:36:16 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- ac-branch merge
- drop AC bcond

---- Files affected:
SPECS:
   qt4.spec (1.123 -> 1.124) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.123 SPECS/qt4.spec:1.124
--- SPECS/qt4.spec:1.123	Tue Feb 13 09:06:43 2007
+++ SPECS/qt4.spec	Sat Mar  3 12:36:11 2007
@@ -17,7 +17,6 @@
 %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	AC		# build for AC
 
 %ifnarch %{ix86} %{x8664} sparc sparcv9 alpha ppc
 %undefine	with_ibase
@@ -80,7 +79,6 @@
 BuildRequires:	sed >= 4.0
 %{?with_sqlite:BuildRequires:	sqlite-devel}
 %{?with_odbc:BuildRequires:	unixODBC-devel}
-%if %{without AC}
 BuildRequires:	xorg-lib-libSM-devel
 BuildRequires:	xorg-lib-libXcursor-devel
 BuildRequires:	xorg-lib-libXext-devel
@@ -89,11 +87,9 @@
 BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libXrandr-devel
 BuildRequires:	xorg-lib-libXrender-devel
-%endif
-%{?with_AC:BuildRequires:	X11-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
@@ -200,7 +196,6 @@
 Requires:	fontconfig-devel
 Requires:	freetype-devel >= 1:2.0.0
 Requires:	libpng-devel >= 2:1.0.8
-%if %{without AC}
 Requires:	xorg-lib-libSM-devel
 Requires:	xorg-lib-libXcursor-devel
 Requires:	xorg-lib-libXext-devel
@@ -209,8 +204,6 @@
 Requires:	xorg-lib-libXinerama-devel
 Requires:	xorg-lib-libXrandr-devel
 Requires:	xorg-lib-libXrender-devel
-%endif
-%{?with_AC:Requires:	X11-devel}
 
 %description -n QtGui-devel
 Graphical User Interface components - development files.
@@ -653,7 +646,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.UTF-8
 Ten moduł udostępnia klasy do obsługi D-BUS. D-BUS to mechanizm
@@ -1016,7 +1009,7 @@
 	-xshape"
 
 ##################################
-#      STATIC MULTI-THREAD       #
+#	  STATIC MULTI-THREAD	   #
 ##################################
 
 %if %{with static_libs}
@@ -1043,7 +1036,7 @@
 %endif
 
 ##################################
-#      SHARED MULTI-THREAD       #
+#	  SHARED MULTI-THREAD	   #
 ##################################
 
 OPT=" \
@@ -1134,7 +1127,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
 
@@ -1181,7 +1174,7 @@
 	elif [ -f "$r" ]; then
 		echo "$2" >> $1.files
 	else
-		echo "Error generation devel files list!"
+		echo "Error generation $1 files list!"
 		echo "$r: no such file or direcotry!"
 		return 1
 	fi
@@ -1197,8 +1190,7 @@
 	if [ -d "$RPM_BUILD_ROOT%{_includedir}/qt4/$MODULE" ]; then
 		ifecho $MODULE-devel %{_includedir}/qt4/$MODULE
 	fi
-	for f in `find $RPM_BUILD_ROOT%{_includedir}/qt4/$MODULE -printf "%%P "`
-	do
+	for f in `find $RPM_BUILD_ROOT%{_includedir}/qt4/$MODULE -printf "%%P "` do
 		ifecho $MODULE-devel %{_includedir}/qt4/$MODULE/$f
 		ifecho $MODULE-devel %{_includedir}/qt4/Qt/$f
 	done
@@ -1241,7 +1233,7 @@
 
 %post	-n QtCore
 /sbin/ldconfig
-cat << EOF
+%banner -e %{name} <<-EOF
  *******************************************************
  *                                                     *
  *  NOTE:                                              *
@@ -1473,18 +1465,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
@@ -1537,7 +1542,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
@@ -1545,6 +1552,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.124  2007/03/03 11:36:11  glen
+- ac-branch merge
+- drop AC bcond
+
 Revision 1.123  2007/02/13 08:06:43  glen
 - tabs in preamble
 
================================================================

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