Author: qboosh Date: Sun Feb 26 17:51:53 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- more merges from AC-branch:
- -designer-libs -> QtDesigner (package names cleanup)
- added QtUiTools*
- QtDesigner deps
---- Files affected:
SPECS:
qt4.spec (1.77 -> 1.78)
---- Diffs:
================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.77 SPECS/qt4.spec:1.78
--- SPECS/qt4.spec:1.77 Thu Feb 23 12:13:17 2006
+++ SPECS/qt4.spec Sun Feb 26 18:51:48 2006
@@ -1,9 +1,6 @@
# $Revision$, $Date$
#
# TODO:
-# - QtUiTools to subpackage
-# (headers in %{_includedir}/qt4/QtUiTools, but (static-only) lib is
not installed)
-# - qt4-designer-libs vs QtDesigner-{devel,static} naming inconsistency
# - better descriptions
# - more cleanups
# - check if translations are available
@@ -15,7 +12,6 @@
%bcond_without mysql # don't build MySQL plugin
%bcond_without odbc # don't build unixODBC plugin
%bcond_without pgsql # don't build PostgreSQL plugin
-%bcond_without designer # don't build designer (it takes long)
%bcond_without sqlite3 # don't build SQLite3 plugin
%bcond_without sqlite # don't build SQLite2 plugin
%bcond_without ibase # don't build ibase (InterBase/Firebird) plugin
@@ -60,11 +56,7 @@
Patch6: %{name}-antialias.patch
Patch7: %{name}-support-cflags-with-commas.patch
Patch8: %{name}-build-lib-static.patch
-%if %{with dont_enable}
-Patch9: qt-FHS.patch
-# no tutorials exist
-Patch10: qt-disable_tutorials.patch
-%endif
+Patch9: %{name}-x11_fonts.patch
URL: http://www.trolltech.com/products/qt/
%{?with_ibase:BuildRequires: Firebird-devel}
BuildRequires: OpenGL-GLU-devel
@@ -627,11 +619,93 @@
%description -n QtAssistant-static -l pl
Statyczna biblioteka kliencka Qt Assistant.
+%package -n QtDesigner
+Summary: Classes for extending Qt Designer
+Summary(pl): Klasy do rozbudowy Qt Designera
+Group: X11/Libraries
+Requires: QtGui = %{version}-%{release}
+Requires: QtNetwork = %{version}-%{release}
+Requires: QtXml = %{version}-%{release}
+Obsoletes: qt4-designer-libs
+
+%description -n QtDesigner
+This module provides classes that allow you to create your own custom
+widget plugins for Qt Designer, and classes that enable you to access
+Qt Designer's components.
+
+%description -n QtDesigner -l pl
+Ten moduł dostarcza klasy, które pozwalają tworzyć własne wtyczki dla
+Qt Designera oraz klasy, które umożliwiają dostęp do jego komponentów.
+
+%package -n QtDesigner-devel
+Summary: Classes for extending Qt Designer - development files
+Summary(pl): Klasy do rozbudowy Qt Designera - pliki programistyczne
+Group: X11/Development/Libraries
+Requires: QtCore-devel = %{version}-%{release}
+Requires: QtDesigner = %{version}-%{release}
+
+%description -n QtDesigner-devel
+Classes for extending Qt Designer - development files.
+
+%description -n QtDesigner-devel -l pl
+Klasy do rozbudowy Qt Designera - pliki programistyczne.
+
+%package -n QtDesigner-static
+Summary: Classes for extending Qt Designer - static libraries
+Summary(pl): Klasy do rozbudowy Qt Designera - biblioteki statyczne
+Group: X11/Development/Libraries
+Requires: QtDesigner-devel = %{version}-%{release}
+
+%description -n QtDesigner-static
+Classes for extending Qt Designer - static libraries.
+
+%description -n QtDesigner-static -l pl
+Klasy do rozbudowy Qt Designera - biblioteki statyczne.
+
+%package -n QtUiTools
+Summary: Classes for handling Qt Designer forms in applications
+Summary(pl): Klasy do obsługi formularzy Qt Designera w aplikacjach
+Group: X11/Libraries
+
+%description -n QtUiTools
+The QtUiTools module provides classes to handle forms created with Qt
+Designer.
+
+%description -n QtUiTools -l pl
+Moduł QtUiTools udostępnia klasy do obsługi formularzy tworzonych przy
+użyciu Qt Designera.
+
+%package -n QtUiTools-devel
+Summary: Classes for handling Qt Designer forms in applications -
development files
+Summary(pl): Klasy do obsługi formularzy Qt Designera w aplikacjach - pliki
programistyczne
+Group: X11/Development/Libraries
+
+%description -n QtUiTools-devel
+Classes for handling Qt Designer forms in applications - development
+files.
+
+%description -n QtUiTools-devel -l pl
+Klasy do obsługi formularzy Qt Designera w aplikacjach - pliki
+programistyczne.
+
+%package -n QtUiTools-static
+Summary: Classes for handling Qt Designer forms in applications - static
library
+Summary(pl): Klasy do obsługi formularzy Qt Designera w aplikacjach -
biblioteka statyczna
+Group: X11/Development/Libraries
+
+%description -n QtUiTools-static
+Classes for handling Qt Designer forms in applications - static
+library.
+
+%description -n QtUiTools-static -l pl
+Klasy do obsługi formularzy Qt Designera w aplikacjach - biblioteka
+statyczna.
+
%package assistant
Summary: Qt documentation browser
Summary(pl): Przeglądarka dokumentacji Qt
Group: X11/Development/Tools
-Requires: %{name}-doc
+Requires: %{name}-doc = %{version}-%{release}
%description assistant
Qt Assistant is a tool for browsing on-line documentation with
@@ -662,7 +736,7 @@
Summary: IDE used for GUI designing with Qt library
Summary(pl): IDE służące do projektowania GUI za pomocą biblioteki Qt
Group: X11/Applications
-Requires: %{name}-designer-libs = %{version}-%{release}
+Requires: QtDesigner = %{version}-%{release}
%description designer
An advanced tool used for GUI designing with Qt library.
@@ -671,45 +745,6 @@
Zaawansowane narzędzie służące do projektowania interfejsu graficznego
za pomocą biblioteki Qt.
-%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
-Group: X11/Applications
-
-%description designer-libs
-Libraries used by the Qt GUI Designer.
-
-%description designer-libs -l pl
-Biblioteki wykorzystywane przez narzędzie projektowania interfejsu
-graficznego - Qt Designer.
-
-%package -n QtDesigner-devel
-Summary: IDE used for GUI designing with Qt library - development files
-Summary(pl): IDE służące do projektowania GUI za pomocą biblioteki Qt -
pliki programistyczne
-Group: X11/Development/Libraries
-Requires: %{name}-designer-libs = %{version}-%{release}
-Requires: QtCore-devel = %{version}-%{release}
-
-%description -n QtDesigner-devel
-IDE used for GUI designing with Qt library - development files.
-
-%description -n QtDesigner-devel -l pl
-IDE służące do projektowania GUI za pomocą biblioteki Qt - pliki
-programistyczne.
-
-%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 = %{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.
-
%package linguist
Summary: Translation helper for Qt
Summary(pl): Aplikacja ułatwiająca tłumaczenie aplikacji oparty o Qt
@@ -791,17 +826,6 @@
%description doc -l pl
Dokumentacja qt w formacie HTML.
-%package man
-Summary: Qt man pages
-Summary(pl): Qt - strony man
-Group: X11/Development/Libraries
-
-%description man
-Qt documentation in man pages format.
-
-%description man -l pl
-Dokumentacja Qt w formacie stron man.
-
%package examples
Summary: Example programs bundled with Qt
Summary(pl): Ćwiczenia i przykłady do Qt
@@ -831,10 +855,7 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%if %{with dont_enable}
%patch9 -p1
-%patch10 -p1
-%endif
sed -i -e 's,usr/X11R6/,usr/,' mkspecs/linux-g*/qmake.conf
@@ -935,7 +956,7 @@
%{__make} -C src
%{__make} -C tools/assistant/lib
-%{__make} -C tools/designer/src/lib
+%{__make} -C tools/designer
if [ ! -d staticlib ]; then
mkdir staticlib
cp -a lib/*.a staticlib
@@ -958,18 +979,16 @@
echo "yes" | ./configure $COMMONOPT $OPT
%{__make}
+%if %{with dont_enable}
%{__make} \
sub-tools-all-ordered \
sub-demos-all-ordered \
sub-examples-all-ordered
-%if %{with dont_enable}
-%if %{with designer}
cd tools/designer/designer
lrelease designer_de.ts
lrelease designer_fr.ts
cd -
-%endif
cd tools/assistant
lrelease assistant_de.ts
lrelease assistant_fr.ts
@@ -980,9 +999,6 @@
cd -
%endif
-# kill -L/inside/builddir from *.la and *.pc (bug #77152)
-%{__sed} -i -e "s,-L$PWD/lib,,g" lib/*.{la,pc,prl}
-
%install
rm -rf $RPM_BUILD_ROOT
install -d
$RPM_BUILD_ROOT{%{_bindir},%{_desktopdir},%{_pixmapsdir},%{_pkgconfigdir}}
@@ -991,6 +1007,9 @@
%{__make} install \
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}
+
install -d \
$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} \
$RPM_BUILD_ROOT%{_libdir}/qt4/plugins/{crypto,network}
@@ -1022,11 +1041,9 @@
install tools/assistant/images/assistant.png \
$RPM_BUILD_ROOT%{_pixmapsdir}/qt4-assistant.png
-%if %{with designer}
install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
install tools/designer/src/designer/images/designer.png \
$RPM_BUILD_ROOT%{_pixmapsdir}/qt4-designer.png
-%endif
%if %{with static_libs}
install staticlib/*.a $RPM_BUILD_ROOT%{_libdir}
@@ -1042,10 +1059,8 @@
install tools/assistant/assistant_de.qm
$RPM_BUILD_ROOT%{_datadir}/locale/de/LC_MESSAGES/assistant.qm
%if %{with dont_enable}
-%if %{with designer}
install tools/designer/designer/designer_de.qm
$RPM_BUILD_ROOT%{_datadir}/locale/de/LC_MESSAGES/designer.qm
install tools/designer/designer/designer_fr.qm
$RPM_BUILD_ROOT%{_datadir}/locale/fr/LC_MESSAGES/designer.qm
-%endif
install tools/assistant/assistant_fr.qm
$RPM_BUILD_ROOT%{_datadir}/locale/fr/LC_MESSAGES/assistant.qm
@@ -1054,7 +1069,7 @@
%endif
cd $RPM_BUILD_ROOT%{_includedir}/qt4/Qt
-for f in
../Qt{3Support,Assistant,Core,Designer,Gui,Network,OpenGL,Sql,Svg,Test,Xml}/*
+for f in
../Qt{3Support,Assistant,Core,Designer,Gui,Network,OpenGL,Sql,Svg,Test,UiTools,Xml}/*
do
if [ ! -d $f ]; then
ln -sf $f `basename $f`
@@ -1064,8 +1079,8 @@
cd -
# Ship doc & qmake stuff
-ln -s ../../..%{_docdir}/%{name}-doc $RPM_BUILD_ROOT%{_qtdir}/doc
-ln -s ../../..%{_datadir}/qt4/mkspecs $RPM_BUILD_ROOT%{_qtdir}/mkspecs
+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
@@ -1134,6 +1149,7 @@
# without *.la *.pc etc.
mkdevfl QtAssistant || /bin/true
mkdevfl QtDesigner || /bin/true
+mkdevfl QtUiTools || /bin/true
echo "%defattr(644,root,root,755)" > examples.files
ifecho examples %{_examplesdir}/qt4
@@ -1195,13 +1211,17 @@
%post -n QtAssistant -p /sbin/ldconfig
%postun -n QtAssistant -p /sbin/ldconfig
-%post designer-libs -p /sbin/ldconfig
-%postun designer-libs -p /sbin/ldconfig
+%post -n QtDesigner -p /sbin/ldconfig
+%postun -n QtDesigner -p /sbin/ldconfig
+
+%post -n QtUiTools -p /sbin/ldconfig
+%postun -n QtUiTools -p /sbin/ldconfig
%files -n QtCore
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libQtCore.so.*.*
%dir %{_qtdir}
+%dir %{_qtdir}/bin
%dir %{_qtdir}/plugins
%dir %{_qtdir}/plugins/accessible
%dir %{_qtdir}/plugins/codecs
@@ -1294,6 +1314,16 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libQtAssistantClient.so.*.*
+%files -n QtDesigner
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libQtDesigner*.so.*.*
+%dir %{_qtdir}/plugins/designer
+%attr(755,root,root) %{_qtdir}/plugins/designer/*.so
+
+%files -n QtUiTools
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libQtUiTools.so.*.*
+
%files assistant
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/qt4-assistant
@@ -1310,7 +1340,6 @@
%attr(755,root,root) %{_qtdir}/bin/uic
%{_datadir}/qt4/q3porting.xml
-%if %{with designer}
%files designer
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/qt4-designer
@@ -1318,18 +1347,11 @@
%{_desktopdir}/qt4-designer.desktop
%{_pixmapsdir}/qt4-designer.png
-%files designer-libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libQtDesigner*.so.*.*
-%dir %{_qtdir}/plugins/designer
-%attr(755,root,root) %{_qtdir}/plugins/designer/*.so
-%endif
-
%files linguist
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/qt4-linguist
-%attr(755,root,root) %{_qtdir}/bin/linguist
%attr(755,root,root) %{_qtdir}/bin/findtr
+%attr(755,root,root) %{_qtdir}/bin/linguist
%attr(755,root,root) %{_qtdir}/bin/lrelease
%attr(755,root,root) %{_qtdir}/bin/lupdate
%attr(755,root,root) %{_qtdir}/bin/qm2ts
@@ -1342,6 +1364,7 @@
%attr(755,root,root) %{_bindir}/qt4-qmake
%attr(755,root,root) %{_qtdir}/bin/qmake
%{_datadir}/qt4/mkspecs
+%{_qtdir}/mkspecs
%files qtconfig
%defattr(644,root,root,755)
@@ -1357,7 +1380,7 @@
%files doc
%defattr(644,root,root,755)
%{_docdir}/%{name}-doc
-%dir %{_qtdir}/doc
+%{_qtdir}/doc
%files -n QtCore-devel -f QtCore-devel.files
%files -n QtDesigner-devel -f QtDesigner-devel.files
@@ -1370,6 +1393,7 @@
%files -n QtXml-devel -f QtXml-devel.files
%files -n Qt3Support-devel -f Qt3Support-devel.files
%files -n QtAssistant-devel -f QtAssistant-devel.files
+%files -n QtUiTools-devel -f QtUiTools-devel.files
%if %{with static_libs}
%files -n QtCore-static
@@ -1404,15 +1428,19 @@
%defattr(644,root,root,755)
%{_libdir}/libQt3Support*.a
-%files -n QtDesigner-static
-%defattr(644,root,root,755)
-%{_libdir}/libQtDesigner.a
-
%files -n QtAssistant-static
%defattr(644,root,root,755)
%{_libdir}/libQtAssistantClient.a
%endif
+%files -n QtDesigner-static
+%defattr(644,root,root,755)
+%{_libdir}/libQtDesigner*.a
+
+%files -n QtUiTools-static
+%defattr(644,root,root,755)
+%{_libdir}/libQtUiTools.a
+
%files demos -f demos.files
%files examples -f examples.files
@@ -1422,6 +1450,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.78 2006/02/26 17:51:48 qboosh
+- more merges from AC-branch:
+ - -designer-libs -> QtDesigner (package names cleanup)
+ - added QtUiTools*
+- QtDesigner deps
+
Revision 1.77 2006/02/23 11:13:17 pluto
- updated to 4.1.1.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.77&r2=1.78&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
