SPECS (DEVEL): qt4.spec - added phonon, QtHelp, QtCLucene, QtWebKi...
shadzik
shadzik at pld-linux.org
Wed Mar 5 16:07:46 CET 2008
Author: shadzik Date: Wed Mar 5 15:07:46 2008 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- added phonon, QtHelp, QtCLucene, QtWebKit
- -continue goes to commonopts
- a small change in mkdevfl()
- proper BC
- builds
---- Files affected:
SPECS:
qt4.spec (1.157.2.4 -> 1.157.2.5)
---- Diffs:
================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.157.2.4 SPECS/qt4.spec:1.157.2.5
--- SPECS/qt4.spec:1.157.2.4 Thu Feb 28 20:47:06 2008
+++ SPECS/qt4.spec Wed Mar 5 16:07:41 2008
@@ -95,7 +95,7 @@
BuildRequires: xorg-lib-libXrandr-devel
BuildRequires: xorg-lib-libXrender-devel
BuildRequires: zlib-devel
-BuildConflicts: QtCore-devel < 4.3.2
+BuildConflicts: QtCore-devel < 4.4.0
Obsoletes: qt-extensions
Obsoletes: qt-utils
Conflicts: kdelibs <= 8:3.2-0.030602.1
@@ -520,6 +520,18 @@
%description -n QtTest-devel -l pl.UTF-8
Szkielet testów - pliki programistyczne.
+%package -n QtTest-static
+Summary: Test framework - static libraries
+Summary(pl.UTF-8): Szkielet testów - biblioteki statyczne
+Group: X11/Development/Libraries
+Requires: QtTest-devel = %{version}-%{release}
+
+%description -n QtTest-static
+Test framework - static libraries.
+
+%description -n QtTest-static -l pl.UTF-8
+Szkielet testów - biblioteki statyczne.
+
%package -n QtXml
Summary: Classes for handling XML
Summary(pl.UTF-8): Klasy do obsługi XML-a
@@ -814,6 +826,78 @@
Klasy do obsługi formularzy Qt Designera w aplikacjach - biblioteka
statyczna.
+%package -n QtHelp
+Summary: QtHelp
+Group: X11/Libraries
+Requires: QtGui = %{version}-%{release}
+
+%description -n QtHelp
+QtHelp.
+
+%package -n QtHelp-devel
+Summary: QtHelp - development files
+Group: X11/Development/Libraries
+Requires: QtCore-devel = %{version}-%{release}
+
+%description -n QtHelp-devel
+QtHelp - development files.
+
+%package -n QtHelp-static
+Summary: QtHelp - static libraries
+Group: X11/Development/Libraries
+Requires: QtCore-devel = %{version}-%{release}
+
+%description -n QtHelp-static
+QtHelp - static libraries.
+
+%package -n QtWebKit
+Summary: QtWebKit
+Group: X11/Libraries
+Requires: QtGui = %{version}-%{release}
+
+%description -n QtWebKit
+QtWebKit.
+
+%package -n QtWebKit-devel
+Summary: QtWebKit - development files
+Group: X11/Development/Libraries
+Requires: QtCore-devel = %{version}-%{release}
+
+%description -n QtWebKit-devel
+QtWebKit - development files.
+
+%package -n QtWebKit-static
+Summary: QtWebKit - static libraries
+Group: X11/Development/Libraries
+Requires: QtCore-devel = %{version}-%{release}
+
+%description -n QtWebKit-static
+QtWebKit - static libraries.
+
+%package -n QtCLucene
+Summary: QtCLucene
+Group: X11/Libraries
+Requires: QtGui = %{version}-%{release}
+
+%description -n QtCLucene
+QtCLucene.
+
+%package -n QtCLucene-devel
+Summary: QtCLucene - development files
+Group: X11/Development/Libraries
+Requires: QtCore-devel = %{version}-%{release}
+
+%description -n QtCLucene-devel
+QtCLucene - development files.
+
+%package -n QtCLucene-static
+Summary: QtCLucene - static libraries
+Group: X11/Development/Libraries
+Requires: QtCore-devel = %{version}-%{release}
+
+%description -n QtCLucene-static
+QtCLucene - static libraries.
+
%package assistant
Summary: Qt documentation browser
Summary(pl.UTF-8): Przeglądarka dokumentacji Qt
@@ -883,6 +967,22 @@
Gdy jeden z nich jest już przetłumaczony, automatycznie przechodzi do
następnego, aż wszystkie będą przetłumaczone.
+%package phonon
+Summary: phonon
+Group: X11/Development/Tools
+
+%description phonon
+phonon.
+
+%package phonon-devel
+Summary: phonon - development files
+Group: X11/Development/Libraries
+Requires: QtCore-devel = %{version}-%{release}
+Requires: phonon = %{version}=%{release}
+
+%description phonon-devel
+phonon - development files.
+
%package qmake
Summary: Qt makefile generator
Summary(pl.UTF-8): Generator plików makefile dla aplikacji Qt
@@ -1057,7 +1157,8 @@
-xcursor \
-xkb \
-xrender \
- -xshape"
+ -xshape \
+ -continue"
##################################
# STATIC MULTI-THREAD #
@@ -1071,15 +1172,13 @@
-%{!?with_sqlite3:no}%{?with_sqlite3:qt}-sql-sqlite \
-%{!?with_sqlite:no}%{?with_sqlite:qt}-sql-sqlite2 \
-%{!?with_ibase:no}%{?with_ibase:qt}-sql-ibase \
- -static \
- -continue"
+ -static"
echo "yes" | ./configure $COMMONOPT $OPT
%{__make} -C src
%{__make} -C tools/assistant/lib
%{__make} -C tools/designer
-%{__make} -C tools/qdbus/src
if [ ! -d staticlib ]; then
mkdir staticlib
cp -a lib/*.a staticlib
@@ -1157,8 +1256,6 @@
$RPM_BUILD_ROOT%{_pixmapsdir}/linguist-qt4.png
install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}/assistant-qt4.desktop
-install tools/assistant/images/assistant.png \
- $RPM_BUILD_ROOT%{_pixmapsdir}/assistant-qt4.png
install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/designer-qt4.desktop
install tools/designer/src/designer/images/designer.png \
@@ -1249,7 +1346,9 @@
fi
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
+ if [ -a "$RPM_BUILD_ROOT%{_includedir}/qt4/Qt/$f" ]; then
+ ifecho $MODULE-devel %{_includedir}/qt4/Qt/$f
+ fi
done
for f in $@; do ifecho $MODULE-devel $f; done
}
@@ -1263,8 +1362,12 @@
mkdevfl QtSql
mkdevfl QtSvg
mkdevfl QtTest
+mkdevfl QtHelp
+mkdevfl QtWebKit
+mkdevfl QtCLucene
mkdevfl QtXml
mkdevfl Qt3Support
+mkdevfl phonon
# without *.la *.pc etc.
mkdevfl QtAssistant || /bin/true
@@ -1314,6 +1417,15 @@
%post -n QtTest -p /sbin/ldconfig
%postun -n QtTest -p /sbin/ldconfig
+%post -n QtHelp -p /sbin/ldconfig
+%postun -n QtHelp -p /sbin/ldconfig
+
+%post -n QtWebKit -p /sbin/ldconfig
+%postun -n QtWebKit -p /sbin/ldconfig
+
+%post -n QtCLucene -p /sbin/ldconfig
+%postun -n QtCLucene -p /sbin/ldconfig
+
%post -n QtXml -p /sbin/ldconfig
%postun -n QtXml -p /sbin/ldconfig
@@ -1329,6 +1441,9 @@
%post -n QtUiTools -p /sbin/ldconfig
%postun -n QtUiTools -p /sbin/ldconfig
+%post phonon -p /sbin/ldconfig
+%postun phonon -p /sbin/ldconfig
+
%files -n QtCore
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libQtCore.so.*.*
@@ -1344,6 +1459,7 @@
%dir %{_qtdir}/plugins/inputmethods
%dir %{_qtdir}/plugins/network
%dir %{_qtdir}/plugins/sqldrivers
+%dir %{_qtdir}/plugins/script
%dir %{_datadir}/qt4
%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/qt4.qm
%lang(de) %{_datadir}/locale/de/LC_MESSAGES/qt4.qm
@@ -1367,6 +1483,8 @@
%attr(755,root,root) %ghost %{_libdir}/libQtDBus.so.4
%attr(755,root,root) %{_qtdir}/bin/qdbus
%attr(755,root,root) %{_qtdir}/bin/qdbusviewer
+# ?? is this the proper place?
+%attr(755,root,root) %{_qtdir}/plugins/script/libqtscriptdbus.so
%files -n QtGui
%defattr(644,root,root,755)
@@ -1407,7 +1525,7 @@
%if %{with pgsql}
%files -n QtSql-pgsql
%defattr(644,root,root,755)
-%attr(755,root,root) %{_qtdir}/plugins/sqldrivers/libqsqlpsql.so
+#%attr(755,root,root) %{_qtdir}/plugins/sqldrivers/libqsqlpsql.so
%endif
%if %{with sqlite}
@@ -1473,18 +1591,36 @@
%attr(755,root,root) %{_libdir}/libQtUiTools.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libQtUiTools.so.4
+%files -n QtCLucene
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libQtCLucene.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQtCLucene.so.4
+
+%files -n QtHelp
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libQtHelp.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQtHelp.so.4
+%attr(755,root,root) %{_qtdir}/bin/qhelpconverter
+%attr(755,root,root) %{_qtdir}/bin/qhelpgenerator
+
+%files -n QtWebKit
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libQtWebKit.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQtWebKit.so.4
+
%files assistant
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/pixeltool
%attr(755,root,root) %{_bindir}/assistant-qt4
%attr(755,root,root) %{_qtdir}/bin/pixeltool
%attr(755,root,root) %{_qtdir}/bin/assistant
+%attr(755,root,root) %{_qtdir}/bin/assistant_adp
%lang(de) %{_datadir}/locale/de/LC_MESSAGES/qt4-assistant.qm
%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/qt4-assistant.qm
%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/qt4-assistant.qm
%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/qt4-assistant.qm
%{_desktopdir}/assistant-qt4.desktop
-%{_pixmapsdir}/assistant-qt4.png
+#%{_pixmapsdir}/assistant-qt4.png
%files build
%defattr(644,root,root,755)
@@ -1526,6 +1662,13 @@
%{_desktopdir}/linguist-qt4.desktop
%{_pixmapsdir}/linguist-qt4.png
+%files phonon
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libphonon.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libphonon.so.4
+%dir %{_qtdir}/plugins/phonon_backend
+%attr(755,root,root) %{_qtdir}/plugins/phonon_backend/libphonon_gstreamer.so
+
%files qmake
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/qmake-qt4
@@ -1584,6 +1727,15 @@
%files -n QtTest-devel -f QtTest-devel.files
%defattr(644,root,root,755)
+%files -n QtHelp-devel -f QtHelp-devel.files
+%defattr(644,root,root,755)
+
+%files -n QtWebKit-devel -f QtWebKit-devel.files
+%defattr(644,root,root,755)
+
+%files -n QtCLucene-devel -f QtCLucene-devel.files
+%defattr(644,root,root,755)
+
%files -n QtXml-devel -f QtXml-devel.files
%defattr(644,root,root,755)
@@ -1598,6 +1750,9 @@
%files -n QtUiTools-devel -f QtUiTools-devel.files
%defattr(644,root,root,755)
+%files phonon-devel -f phonon-devel.files
+%defattr(644,root,root,755)
+
%if %{with static_libs}
%files -n QtCore-static
%defattr(644,root,root,755)
@@ -1631,6 +1786,22 @@
%defattr(644,root,root,755)
%{_libdir}/libQtSvg.a
+%files -n QtTest-static
+%defattr(644,root,root,755)
+%{_libdir}/libQtTest.a
+
+#%files -n QtCLucene-static
+#%defattr(644,root,root,755)
+#%{_libdir}/libQtCLucene.a
+
+%files -n QtHelp-static
+%defattr(644,root,root,755)
+%{_libdir}/libQtHelp.a
+
+%files -n QtWebKit-static
+%defattr(644,root,root,755)
+%{_libdir}/libQtWebKit.a
+
%files -n QtXml-static
%defattr(644,root,root,755)
%{_libdir}/libQtXml.a
@@ -1641,7 +1812,7 @@
%files -n QtAssistant-static
%defattr(644,root,root,755)
-%{_libdir}/libQtAssistantClient.a
+#%{_libdir}/libQtAssistantClient.a
%files -n QtDesigner-static
%defattr(644,root,root,755)
@@ -1665,6 +1836,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.157.2.5 2008-03-05 15:07:41 shadzik
+- added phonon, QtHelp, QtCLucene, QtWebKit
+- -continue goes to commonopts
+- a small change in mkdevfl()
+- proper BC
+- builds
+
Revision 1.157.2.4 2008-02-28 19:47:06 shadzik
- well, -continue does the thing and let's us compile without having a shared libpgproto from postgresql
- although it has problems while linking = doesn't build
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qt4.spec?r1=1.157.2.4&r2=1.157.2.5&f=u
More information about the pld-cvs-commit
mailing list