Author: shadzik Date: Wed May 2 16:29:36 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- up to 4.3.0beta
- raw, without patches
- NFY but builds fine
---- Files affected:
SPECS:
qt4.spec (1.127 -> 1.128)
---- Diffs:
================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.127 SPECS/qt4.spec:1.128
--- SPECS/qt4.spec:1.127 Thu Mar 22 12:45:32 2007
+++ SPECS/qt4.spec Wed May 2 18:29:30 2007
@@ -29,23 +29,25 @@
%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.2.3
-Release: 1
+Version: 4.3.0
+Release: 0.%{_beta}.1
License: GPL/QPL
Group: X11/Libraries
-Source0:
ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz
-# Source0-md5: 13f12bf58a32ebf15837fcd605cb3c99
+Source0:
ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}%{_beta}.tar.gz
+# Source0-md5: cab2e0829f57f9c301aa9b7241cf9546
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
@@ -924,15 +926,15 @@
Programas exemplo para o Qt versão.
%prep
-%setup -q -n qt-x11-opensource-src-%{version}
-%patch0 -p1
-%patch2 -p1
-%patch3 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+%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
%{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
mkspecs/common/linux.conf
@@ -1064,15 +1066,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,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}/*.pc
+%{__sed} -i -e "s,-L$PWD/lib,,g" $RPM_BUILD_ROOT%{_libdir}/*.{la,prl}
+#%{__sed} -i -e '
+# s|moc_location=.*|moc_location=%{_bindir}/qt4-moc|;
+# s|uic_location=.*|uic_location=%{_bindir}/qt4-uic|;
+# ' $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}
@@ -1144,22 +1146,22 @@
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}
-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`
- MODULE2=`echo $MODULE | tr a-z A-Z | sed s:QT::`
- DEFS="-D_REENTRANT"
-
- if [ "$MODULE2" == "3SUPPORT" ]; then
- DEFS="$DEFS -DQT3_SUPPORT -DQT_QT3SUPPORT_LIB"
- else
- DEFS="$DEFS -DQT_"$MODULE2"_LIB"
- fi
- [ "$HAVEDEBUG" -eq 0 ] && DEFS="$DEFS -DQT_NO_DEBUG"
-
- sed -i -e "s:-DQT_SHARED:-DQT_SHARED $DEFS:" $f
-done
+#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`
+# MODULE2=`echo $MODULE | tr a-z A-Z | sed s:QT::`
+# DEFS="-D_REENTRANT"
+#
+# if [ "$MODULE2" == "3SUPPORT" ]; then
+# DEFS="$DEFS -DQT3_SUPPORT -DQT_QT3SUPPORT_LIB"
+# else
+# DEFS="$DEFS -DQT_"$MODULE2"_LIB"
+# fi
+# [ "$HAVEDEBUG" -eq 0 ] && DEFS="$DEFS -DQT_NO_DEBUG"
+#
+# sed -i -e "s:-DQT_SHARED:-DQT_SHARED $DEFS:" $f
+#done
# Prepare some files list
ifecho() {
@@ -1186,7 +1188,7 @@
ifecho $MODULE-devel "%{_libdir}/lib$MODULE*.so"
ifecho $MODULE-devel "%{_libdir}/lib$MODULE*.la"
ifecho $MODULE-devel "%{_libdir}/lib$MODULE*.prl"
- ifecho $MODULE-devel "%{_pkgconfigdir}/$MODULE*.pc"
+# ifecho $MODULE-devel "%{_pkgconfigdir}/$MODULE*.pc"
if [ -d "$RPM_BUILD_ROOT%{_includedir}/qt4/$MODULE" ]; then
ifecho $MODULE-devel %{_includedir}/qt4/$MODULE
fi
@@ -1346,7 +1348,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}
@@ -1354,7 +1356,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
@@ -1400,7 +1402,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)
@@ -1455,9 +1457,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)
@@ -1552,6 +1554,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.128 2007/05/02 16:29:30 shadzik
+- up to 4.3.0beta
+- raw, without patches
+- NFY but builds fine
+
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.127&r2=1.128&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
