SPECS: qt4.spec - reverted back to 4.2.3

[deejay1]

Author: deejay1                      Date: Thu May  3 08:23:32 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- reverted back to 4.2.3

---- Files affected:
SPECS:
   qt4.spec (1.129 -> 1.130) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.129 SPECS/qt4.spec:1.130
--- SPECS/qt4.spec:1.129	Wed May  2 18:38:36 2007
+++ SPECS/qt4.spec	Thu May  3 10:23:27 2007
@@ -29,25 +29,23 @@
 %define		_withsql	1
 %{!?with_sqlite3:%{!?with_sqlite:%{!?with_ibase:%{!?with_mysql:%{!?with_pgsql:%{!?with_odbc:%undefine _withsql}}}}}}
 
-%define		_beta	beta
-
 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
 Summary(pt_BR.UTF-8):	Estrutura para rodar aplicações GUI Qt
 Name:		qt4
-Version:	4.3.0
-Release:	0.%{_beta}.1
+Version:	4.2.3
+Release:	1
 License:	GPL/QPL
 Group:		X11/Libraries
-Source0:	ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}%{_beta}.tar.gz
-# Source0-md5:	cab2e0829f57f9c301aa9b7241cf9546
+Source0:	ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz
+# Source0-md5:	13f12bf58a32ebf15837fcd605cb3c99
 Source2:	%{name}-qtconfig.desktop
 Source3:	%{name}-designer.desktop
 Source4:	%{name}-assistant.desktop
 Source5:	%{name}-linguist.desktop
 Source6:	%{name}_pl.ts
-#Patch0:		%{name}-tools.patch
+Patch0:		%{name}-tools.patch
 Patch2:		%{name}-buildsystem.patch
 Patch3:		%{name}-locale.patch
 Patch5:		%{name}-sse.patch
@@ -926,15 +924,15 @@
 Programas exemplo para o Qt versão.
 
 %prep
-%setup -q -n qt-x11-opensource-src-%{version}%{_beta}
-#%patch0 -p1
-#%patch2 -p1
-#%patch3 -p1
-#%patch5 -p1
-#%patch6 -p1
-#%patch7 -p1
-#%patch8 -p1
-#%patch9 -p1
+%setup -q -n qt-x11-opensource-src-%{version}
+%patch0 -p1
+%patch2 -p1
+%patch3 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
 	mkspecs/common/linux.conf
@@ -1066,16 +1064,15 @@
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
 # kill -L/inside/builddir from *.la and *.pc (bug #77152)
-%{__sed} -i -e "s,-L$PWD/lib,,g" $RPM_BUILD_ROOT%{_libdir}/*.{la,prl}
-%{__sed} -i -e "s,-L$PWD/lib,,g" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc
+%{__sed} -i -e "s,-L$PWD/lib,,g" $RPM_BUILD_ROOT%{_libdir}/*.{la,pc,prl}
 %{__sed} -i -e '
 	s|moc_location=.*|moc_location=%{_bindir}/qt4-moc|;
 	s|uic_location=.*|uic_location=%{_bindir}/qt4-uic|;
-	' $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc
+	' $RPM_BUILD_ROOT%{_libdir}/*.pc
 
 # install tools
 install bin/findtr	$RPM_BUILD_ROOT%{_qtdir}/bin
-#install bin/qvfb	$RPM_BUILD_ROOT%{_bindir}
+install bin/qvfb	$RPM_BUILD_ROOT%{_bindir}
 install bin/pixeltool	$RPM_BUILD_ROOT%{_bindir}
 install bin/qdbus	$RPM_BUILD_ROOT%{_bindir}
 install bin/qdbuscpp2xml	$RPM_BUILD_ROOT%{_bindir}
@@ -1147,7 +1144,7 @@
 ln -s %{_docdir}/%{name}-doc $RPM_BUILD_ROOT%{_qtdir}/doc
 ln -s %{_datadir}/qt4/mkspecs $RPM_BUILD_ROOT%{_qtdir}/mkspecs
 
-#mv $RPM_BUILD_ROOT%{_libdir}/*.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
+mv $RPM_BUILD_ROOT%{_libdir}/*.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
 for f in $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc; do
 	HAVEDEBUG=`echo $f | grep _debug | wc -l`
 	MODULE=`echo $f | basename $f | cut -d. -f1 | cut -d_ -f1`
@@ -1349,7 +1346,7 @@
 %if %{with sqlite}
 %files -n QtSql-sqlite
 %defattr(644,root,root,755)
-#%attr(755,root,root) %{_qtdir}/plugins/sqldrivers/libqsqlite2*.so
+%attr(755,root,root) %{_qtdir}/plugins/sqldrivers/libqsqlite2*.so
 %endif
 
 %if %{with sqlite3}
@@ -1357,7 +1354,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_qtdir}/plugins/sqldrivers/libqsqlite*.so
 %if %{with sqlite}
-#%exclude %{_qtdir}/plugins/sqldrivers/libqsqlite2*.so
+%exclude %{_qtdir}/plugins/sqldrivers/libqsqlite2*.so
 %endif
 %endif
 
@@ -1403,7 +1400,7 @@
 
 %files -n QtUiTools
 %defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/libQtUiTools.so.*.*
+%attr(755,root,root) %{_libdir}/libQtUiTools.so.*.*
 
 %files assistant
 %defattr(644,root,root,755)
@@ -1458,9 +1455,9 @@
 %{_desktopdir}/qt4-qtconfig.desktop
 %{_pixmapsdir}/qt4-qtconfig.png
 
-#%files -n qvfb
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_bindir}/qvfb
+%files -n qvfb
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/qvfb
 
 %files doc
 %defattr(644,root,root,755)
@@ -1555,13 +1552,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.129  2007/05/02 16:38:36  shadzik
-- fix .pc files issue
-
-Revision 1.128  2007/05/02 16:29:30  shadzik
-- up to 4.3.0beta
-- raw, without patches
-- NFY but builds fine
+Revision 1.130  2007/05/03 08:23:27  deejay1
+- reverted back to 4.2.3
 
 Revision 1.127  2007/03/22 11:45:32  pascalek
 - glen changes from AC-branch; removing AC bcond continued (glen: why?)
================================================================

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