Author: pascalek Date: Thu Jan 12 01:25:56 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- Updated to 4.1.0, release 1
- 6 unpackaged files
- static library packages
- new QtTest and QtSvg packages
- builds and works
---- Files affected:
SPECS:
qt4.spec (1.45 -> 1.46)
---- Diffs:
================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.45 SPECS/qt4.spec:1.46
--- SPECS/qt4.spec:1.45 Tue Dec 13 19:01:47 2005
+++ SPECS/qt4.spec Thu Jan 12 02:25:50 2006
@@ -8,7 +8,7 @@
# Conditional build:
%bcond_with nas # enable NAS audio support
# static libs disabled for now
-%bcond_with static_libs # build static libraries
+%bcond_without static_libs # build static libraries
%bcond_without cups # disable CUPS support
%bcond_without mysql # don't build MySQL plugin
%bcond_without odbc # don't build unixODBC plugin
@@ -33,13 +33,12 @@
Summary(pl): Biblioteka Qt do tworzenia GUI
Summary(pt_BR): Estrutura para rodar aplicaçőes GUI Qt
Name: qt4
-Version: 4.0.1
-#Release: 1.%{_snap}.0.1
-Release: 1.1
+Version: 4.1.0
+Release: 1
License: GPL/QPL
Group: X11/Libraries
Source0:
ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz
-# Source0-md5: 2db4a4d797d37d0605b776420327503a
+# Source0-md5: 0e3982a54f56b6420d3062b20524410a
Source2: qtconfig.desktop
Source3: designer.desktop
Source4: assistant.desktop
@@ -53,7 +52,6 @@
Patch2: %{name}-buildsystem.patch
Patch4: %{name}-locale.patch
Patch8: %{name}-antialias.patch
-Patch9: %{name}rc1-build.patch
Patch10: %{name}-support-cflags-with-commas.patch
URL: http://www.trolltech.com/products/qt/
Icon: qt.xpm
@@ -85,6 +83,7 @@
BuildRequires: xft-devel
BuildRequires: xrender-devel
BuildRequires: zlib-devel
+BuildConflicts: QtCore
Requires: OpenGL
Conflicts: kdelibs <= 8:3.2-0.030602.1
Obsoletes: qt-extensions
@@ -149,6 +148,20 @@
%description -n QtCore-devel -l pl
Podstawowe klasy używane przez inne moduły - pliki programistyczne.
+%if %{with static_libs}
+%package -n QtCore-static
+Summary: Core classes used by other modules - static libraries
+Summary(pl): Podstawowe klasy używane przez inne moduły - biblioteki
statyczne
+Group: X11/Development/Libraries
+Requires: QtCore-devel = %{epoch}:%{version}-%{release}
+
+%description -n QtCore-static
+Core classes used by other modules - static libraries.
+
+%description -n QtCore-static -l pl
+Podstawowe klasy używane przez inne moduły - biblioteki statyczne.
+%endif
+
%package -n QtGui
Summary: Graphical User Interface components
Summary(pl): Komponenty graficznego interfejsu użytkownika
@@ -174,6 +187,20 @@
%description -n QtGui-devel -l pl
Komponenty graficznego interfejsu użytkownika - pliki programistyczne.
+%if %{with static_libs}
+%package -n QtGui-static
+Summary: Graphical User Interface components - static libraries
+Summary(pl): Komponenty graficznego interfejsu użytkownika - biblioteki
statyczne
+Group: X11/Development/Libraries
+Requires: QtGui-devel = %{epoch}:%{version}-%{release}
+
+%description -n QtGui-static
+Graphical User Interface components - static libraries.
+
+%description -n QtGui-static -l pl
+Komponenty graficznego interfejsu użytkownika - biblioteki statyczne.
+%endif
+
%package -n QtNetwork
Summary: Classes for network programming
Summary(pl): Klasy do programowania sieciowego
@@ -199,6 +226,20 @@
%description -n QtNetwork-devel -l pl
Klasy do programowania sieciowego - pliki programistyczne.
+%if %{with static_libs}
+%package -n QtNetwork-static
+Summary: Classes for network programming - static libraries
+Summary(pl): Klasy do programowania sieciowego - biblioteki statyczne
+Group: X11/Development/Libraries
+Requires: QtNetwork-devel = %{epoch}:%{version}-%{release}
+
+%description -n QtNetwork-static
+Classes for network programming - static libraries.
+
+%description -n QtNetwork-static -l pl
+Klasy do programowania sieciowego - biblioteki statyczne.
+%endif
+
%package -n QtOpenGL
Summary: OpenGL support classes
Summary(pl): Klasy wspomagające OpenGL
@@ -224,6 +265,20 @@
%description -n QtOpenGL-devel -l pl
Klasy wspomagające OpenGL - pliki programistyczne.
+%if %{with static_libs}
+%package -n QtOpenGL-static
+Summary: OpenGL support classes - static libraries
+Summary(pl): Klasy wspomagające OpenGL - biblioteki statyczne
+Group: X11/Development/Libraries
+Requires: QtOpenGL-devel = %{epoch}:%{version}-%{release}
+
+%description -n QtOpenGL-static
+OpenGL support classes - static libraries.
+
+%description -n QtOpenGL-devel -l pl
+Klasy wspomagające OpenGL - biblioteki statyczne.
+%endif
+
%package -n QtSql
Summary: Classes for database integration using SQL
Summary(pl): Klasy do integracji z bazami danych przy użyciu SQL
@@ -250,6 +305,60 @@
Klasy do integracji z bazami danych przy użyciu SQL - pliki
programistyczne.
+%if %{with static_libs}
+%package -n QtSql-static
+Summary: Classes for database integration using SQL - static libraries
+Summary(pl): Klasy do integracji z bazami danych przy użyciu SQL -
biblioteki statyczne
+Group: X11/Development/Libraries
+Requires: QtSql-devel = %{epoch}:%{version}-%{release}
+
+%description -n QtSql-static
+Classes for database integration using SQL - static libraries.
+
+%description -n QtSql-static -l pl
+Klasy do integracji z bazami danych przy użyciu SQL - biblioteki statyczne.
+programistyczne.
+%endif
+
+%package -n QtSvg
+Summary: SVG support.
+Summary(pl): Wsparcie dla SVG.
+Group: X11/Libraries
+Requires: QtCore = %{epoch}:%{version}-%{release}
+
+%description -n QtSvg
+SVG support.
+
+%description -n QtSvg -l pl
+Wsparcie dla SVG.
+
+%package -n QtSvg-devel
+Summary: SVG support - development files.
+Summary(pl): Wsparcie dla SVG - pliki programistyczne.
+Group: X11/Development/Libraries
+Requires: QtCore-devel = %{epoch}:%{version}-%{release}
+Requires: QtSvg = %{epoch}:%{version}-%{release}
+
+%description -n QtSvg-devel
+SVG support - development files.
+
+%description -n QtSvg-devel -l pl
+Wsparcie dla SVG - pliki programistyczne.
+
+%if %{with static_libs}
+%package -n QtSvg-static
+Summary: SVG support - static libraries.
+Summary(pl): Wsparcie dla SVG - biblioteki statyczne.
+Group: X11/Development/Libraries
+Requires: QtSvg-devel = %{epoch}:%{version}-%{release}
+
+%description -n QtSvg-static
+SVG support - static libraries.
+
+%description -n QtSvg-static -l pl
+Wsparcie dla SVG - biblioteki statyczne.
+%endif
+
%package -n QtSql-ibase
Summary: Database plugin for InterBase/Firebird Qt support
Summary(pl): Wtyczka InterBase/Firebird do Qt
@@ -364,6 +473,23 @@
%description -n QtSql-sqlite3 -l pt_BR
Plugin de suporte a SQLite3 para Qt.
+%package -n QtTest
+Summary: Test framework.
+Group: X11/Libraries
+Requires: QtCore = %{epoch}:%{version}-%{release}
+
+%description -n QtTest
+Test framework.
+
+%package -n QtTest-devel
+Summary: Test framework - development files.
+Group: X11/Development/Libraries
+Requires: QtCore-devel = %{epoch}:%{version}-%{release}
+Requires: QtTest = %{epoch}:%{version}-%{release}
+
+%description -n QtTest-devel
+Test framework - development files.
+
%package -n QtXml
Summary: Classes for handling XML
Summary(pl): Klasy do obsługi XML-a
@@ -389,6 +515,20 @@
%description -n QtXml-devel -l pl
Klasy do obsługi XML-a - pliki programistyczne.
+%if %{with static_libs}
+%package -n QtXml-static
+Summary: Classes for handling XML - static libraries
+Summary(pl): Klasy do obsługi XML-a - biblioteki statyczne
+Group: X11/Development/Libraries
+Requires: QtXml-devel = %{epoch}:%{version}-%{release}
+
+%description -n QtXml-static
+Classes for handling XML - static libraries.
+
+%description -n QtXml-static -l pl
+Klasy do obsługi XML-a - biblioteki statyczne.
+%endif
+
%package -n Qt3Support
Summary: Qt3 compatibility library
Summary(pl): Biblioteka kompatybilności z Qt3
@@ -414,6 +554,20 @@
%description -n Qt3Support-devel -l pl
Biblioteka kompatybilności z Qt3 - pliki programistyczne.
+%if %{with static_libs}
+%package -n Qt3Support-static
+Summary: Qt3 compatibility library - static libraries
+Summary(pl): Biblioteka kompatybilności z Qt3 - biblioteki statyczne
+Group: X11/Development/Libraries
+Requires: Qt3Support-devel = %{epoch}:%{version}-%{release}
+
+%description -n Qt3Support-static
+Qt3 compatibility library - static libraries.
+
+%description -n Qt3Support-static -l pl
+Biblioteka kompatybilności z Qt3 - biblioteki statyczne.
+%endif
+
%package assistant
Summary: Qt documentation browser
Summary(pl): Przeglądarka dokumentacji Qt
@@ -472,6 +626,20 @@
IDE służące do projektowania GUI za pomocą biblioteki Qt - pliki
programistyczne.
+%if %{with static_libs}
+%package -n QtDesigner-static
+Summary: IDE used for GUI designing with Qt library - static libraries
+Summary(pl): IDE służące do projektowania GUI za pomocą biblioteki Qt -
biblioteki statyczne
+Group: X11/Development/Libraries
+Requires: QtDesigner-devel = %{epoch}:%{version}-%{release}
+
+%description -n QtDesigner-static
+IDE used for GUI designing with Qt library - static libraries.
+
+%description -n QtDesigner-static -l pl
+IDE służące do projektowania GUI za pomocą biblioteki Qt - biblioteki
statyczne.
+%endif
+
%package designer-libs
Summary: Libraries IDE used for GUI designing with Qt library
Summary(pl): Biblioteki do IDE służącego do projektowania GUI za pomocą
biblioteki Qt
@@ -595,7 +763,6 @@
Programas exemplo para o Qt versăo.
%prep
-#setup -q -n %{_name}-copy-%{_snap}
%setup -q -n qt-x11-opensource-src-%{version}
%patch0 -p1
%if %{with dont_enable}
@@ -605,18 +772,8 @@
%patch2 -p1
%patch4 -p1
%patch8 -p1
-%patch9 -p1
%patch10 -p1
-#cat >> patches/DISABLED <<EOF
-#0005
-#0039
-#0042
-#0043
-#0047
-#EOF
-#./apply_patches
-
# change QMAKE_CFLAGS_RELEASE to build
# properly optimized libs
plik="mkspecs/linux-g++/qmake.conf"
@@ -662,14 +819,11 @@
export QTDIR YACC PATH LD_LIBRARY_PATH QMAKESPEC OPTFLAGS
-BuildLib() {
-# $1 - aditional params
-
##################################
# DEFAULT OPTIONS FOR ALL BUILDS #
##################################
-DEFAULTOPT=" \
+COMMONOPT=" \
-DQT_CLEAN_NAMESPACE \
-verbose \
-prefix %{_prefix} \
@@ -704,17 +858,6 @@
-sm \
-nis"
-./configure \
- $DEFAULTOPT \
- $1 \
- <<_EOF_
-yes
-_EOF_
-
-%{__make} sub-src-all-ordered
-
-}
-
##################################
# STATIC MULTI-THREAD #
##################################
@@ -728,8 +871,14 @@
%{?with_sqlite:-qt-sql-sqlite2} \
%{?with_ibase:-qt-sql-ibase} \
-static"
-BuildLib $OPT
-%{__make} clean
+
+echo "yes" | ./configure $COMMONOPT $OPT
+
+cd src
+%{__make}
+cd ..
+mkdir staticlib
+cp -a lib/*.a staticlib
%endif
##################################
@@ -743,8 +892,10 @@
%{?with_sqlite3:-plugin-sql-sqlite} \
%{?with_sqlite:-plugin-sql-sqlite2} \
%{?with_ibase:-plugin-sql-ibase}"
-BuildLib $OPT
+echo "yes" | ./configure $COMMONOPT $OPT
+
+%{__make}
%{__make} \
sub-tools-all-ordered \
sub-demos-all-ordered \
@@ -807,7 +958,7 @@
%endif
%if %{with static_libs}
-install %{_lib}/*Qt*.a $RPM_BUILD_ROOT%{_libdir}
+install staticlib/*.a $RPM_BUILD_ROOT%{_libdir}
%endif
%if %{with designer}
@@ -838,7 +989,7 @@
%endif
cd $RPM_BUILD_ROOT%{_includedir}/qt4/Qt
-for f in ../Qt{3Support,Core,Gui,Network,OpenGL,Sql,Xml,Designer}/*
+for f in ../Qt{3Support,Core,Gui,Network,OpenGL,Sql,Svg,Test,Xml,Designer}/*
do
if [ ! -d $f ]; then
ln -sf $f `basename $f`
@@ -848,23 +999,6 @@
cd -
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:-L`pwd`/lib::g $f
- sed -i -e "s:-I\${includedir}:-I\${includedir}\
-I\${includedir}/$MODULE -I%{_datadir}/qt4/mkspec/default:" $f
- sed -i -e "s:-DQT_SHARED:-DQT_SHARED $DEFS:" $f
-done
# Prepare some files list
ifecho () {
@@ -906,6 +1040,8 @@
mkdevfl QtNetwork
mkdevfl QtOpenGL
mkdevfl QtSql
+mkdevfl QtSvg
+mkdevfl QtTest
mkdevfl QtXml
mkdevfl Qt3Support
mkdevfl QtDesigner || /bin/true # there is no libQtDesigner.la file :/
@@ -919,7 +1055,8 @@
echo "%defattr(644,root,root,755)" > demos.files
ifecho demos "%{_examplesdir}/qt4-demos"
-ifecho demos "%{_bindir}/qtdemo" >> demos.files
+ifecho demos "%{_bindir}/qtdemo"
+ifecho demos "%{_libdir}/qt4/plugins/arthurplugin/libarthurplugin.so"
for f in `find $RPM_BUILD_ROOT%{_examplesdir}/qt4-demos -printf "%%P "`
do
ifecho demos %{_examplesdir}/qt4-demos/$f
@@ -954,6 +1091,12 @@
%post -n QtSql -p /sbin/ldconfig
%postun -n QtSql -p /sbin/ldconfig
+%post -n QtSvg -p /sbin/ldconfig
+%postun -n QtSvg -p /sbin/ldconfig
+
+%post -n QtTest -p /sbin/ldconfig
+%postun -n QtTest -p /sbin/ldconfig
+
%post -n QtXml -p /sbin/ldconfig
%postun -n QtXml -p /sbin/ldconfig
@@ -972,16 +1115,19 @@
%attr(755,root,root) %{_libdir}/libQtCore*.so.*
%dir %{_libdir}/qt4
%dir %{_libdir}/qt4/plugins
+%dir %{_libdir}/qt4/plugins/accessible
%dir %{_libdir}/qt4/plugins/codecs
%dir %{_libdir}/qt4/plugins/crypto
%dir %{_libdir}/qt4/plugins/imageformats
%dir %{_libdir}/qt4/plugins/network
%dir %{_libdir}/qt4/plugins/sqldrivers
%dir %{_datadir}/qt4
+%{_datadir}/locale/qt_*.qm
%files -n QtGui
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libQtGui*.so.*
+%{_libdir}/qt4/plugins/accessible/*
%{_libdir}/qt4/plugins/codecs/*
%{_libdir}/qt4/plugins/imageformats/*
@@ -997,6 +1143,10 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libQtSql*.so.*
+%files -n QtSvg
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libQtSvg*.so.*
+
%if %{with mysql}
%files -n QtSql-mysql
%defattr(644,root,root,755)
@@ -1034,11 +1184,14 @@
%attr(755,root,root) %{_libdir}/qt4/plugins/sqldrivers/libqsqlodbc*.so
%endif
+%files -n QtTest
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libQtTest*.so.*
+
%files -n QtXml
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libQtXml*.so.*
-
%files -n Qt3Support
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/uic3
@@ -1119,9 +1272,46 @@
%files -n QtNetwork-devel -f QtNetwork-devel.files
%files -n QtOpenGL-devel -f QtOpenGL-devel.files
%files -n QtSql-devel -f QtSql-devel.files
+%files -n QtSvg-devel -f QtSvg-devel.files
+%files -n QtTest-devel -f QtTest-devel.files
%files -n QtXml-devel -f QtXml-devel.files
%files -n Qt3Support-devel -f Qt3Support-devel.files
+%if %{with static_libs}
+%files -n QtCore-static
+%defattr(644,root,root,755)
+%{_libdir}/libQtCore*.a
+
+%files -n QtGui-static
+%defattr(644,root,root,755)
+%{_libdir}/libQtGui*.a
+
+%files -n QtNetwork-static
+%defattr(644,root,root,755)
+%{_libdir}/libQtNetwork*.a
+
+%files -n QtOpenGL-static
+%defattr(644,root,root,755)
+%{_libdir}/libQtOpenGL*.a
+
+%files -n QtSql-static
+%defattr(644,root,root,755)
+%{_libdir}/libQtSql*.a
+
+%files -n QtSvg-static
+%defattr(644,root,root,755)
+%{_libdir}/libQtSvg*.a
+
+%files -n QtXml-static
+%defattr(644,root,root,755)
+%{_libdir}/libQtXml*.a
+
+%files -n Qt3Support-static
+%defattr(644,root,root,755)
+%{_libdir}/libQt3Support*.a
+
+%endif
+
%files demos -f demos.files
%files examples -f examples.files
@@ -1131,6 +1321,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.46 2006/01/12 01:25:50 pascalek
+- Updated to 4.1.0, release 1
+- 6 unpackaged files
+- static library packages
+- new QtTest and QtSvg packages
+- builds and works
+
Revision 1.45 2005/12/13 18:01:47 glen
- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.45&r2=1.46&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
