Author: shadzik Date: Wed Sep 22 09:20:23 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- remove QtAssistant subpackages (obsolete)
- add Obsoletes to QtCore-*
---- Files affected:
packages/qt4:
qt4.spec (1.256 -> 1.257)
---- Diffs:
================================================================
Index: packages/qt4/qt4.spec
diff -u packages/qt4/qt4.spec:1.256 packages/qt4/qt4.spec:1.257
--- packages/qt4/qt4.spec:1.256 Wed Sep 22 08:18:54 2010
+++ packages/qt4/qt4.spec Wed Sep 22 11:20:17 2010
@@ -233,46 +233,6 @@
%description -n Qt3Support-static -l pl.UTF-8
Biblioteka kompatybilności z Qt3 - biblioteki statyczne.
-%package -n QtAssistant
-Summary: Qt Assistant client library
-Summary(pl.UTF-8): Biblioteka kliencka Qt Assistant
-Group: X11/Development/Libraries
-Requires: QtGui = %{version}-%{release}
-Requires: QtNetwork = %{version}-%{release}
-
-%description -n QtAssistant
-This library allows to use Qt Assistant as an application's help tool.
-
-%description -n QtAssistant -l pl.UTF-8
-Ta biblioteka umożliwia wykorzystanie Qt Assistanta jako narzędzie
-pomocy w aplikacjach.
-
-%package -n QtAssistant-devel
-Summary: Qt Assistant client library - development files
-Summary(pl.UTF-8): Biblioteka kliencka Qt Assistant - pliki programistyczne
-Group: X11/Development/Libraries
-Requires: QtAssistant = %{version}-%{release}
-Requires: QtGui-devel = %{version}-%{release}
-Requires: QtNetwork-devel = %{version}-%{release}
-
-%description -n QtAssistant-devel
-Development files for Qt Assistant client library.
-
-%description -n QtAssistant-devel -l pl.UTF-8
-Pliki programistyczne biblioteki klienckiej Qt Assistant.
-
-%package -n QtAssistant-static
-Summary: Static Qt Assistant client library
-Summary(pl.UTF-8): Statyczna biblioteka kliencka Qt Assistant
-Group: X11/Development/Libraries
-Requires: QtAssistant-devel = %{version}-%{release}
-
-%description -n QtAssistant-static
-Static Qt Assistant client library.
-
-%description -n QtAssistant-static -l pl.UTF-8
-Statyczna biblioteka kliencka Qt Assistant.
-
%package -n QtCLucene
Summary: QtCLucene full text search library wrapper
Summary(pl.UTF-8): Interfejs QtCLucene do biblioteki wyszukiwania
pełnotekstowego
@@ -317,6 +277,7 @@
Summary(pl.UTF-8): Podstawowe klasy używane przez inne moduły
Group: X11/Libraries
Requires(post): /sbin/ldconfig
+Obsoletes: QtAssistant
%description -n QtCore
Core classes used by other modules.
@@ -332,6 +293,7 @@
Requires: glib2-devel
Requires: libstdc++-devel
Requires: zlib-devel
+Obsoletes: QtAssistant-devel
%description -n QtCore-devel
Core classes used by other modules - development files.
@@ -344,6 +306,7 @@
Summary(pl.UTF-8): Podstawowe klasy używane przez inne moduły - biblioteki
statyczne
Group: X11/Development/Libraries
Requires: QtCore-devel = %{version}-%{release}
+Obsoletes: QtAssistant-static
%description -n QtCore-static
Core classes used by other modules - static libraries.
@@ -1197,7 +1160,6 @@
Summary: Qt documentation browser
Summary(pl.UTF-8): Przeglądarka dokumentacji Qt
Group: X11/Development/Tools
-Requires: QtAssistant = %{version}-%{release}
Requires: QtDBus = %{version}-%{release}
Requires: QtSql-sqlite3 = %{version}-%{release}
@@ -1230,7 +1192,6 @@
Summary: IDE used for GUI designing with Qt library
Summary(pl.UTF-8): IDE służące do projektowania GUI za pomocą biblioteki Qt
Group: X11/Applications
-Requires: QtAssistant = %{version}-%{release}
Requires: QtDesigner = %{version}-%{release}
%description designer
@@ -1244,7 +1205,6 @@
Summary: Translation helper for Qt
Summary(pl.UTF-8): Aplikacja ułatwiająca tłumaczenie aplikacji oparty o Qt
Group: X11/Development/Tools
-Requires: QtAssistant = %{version}-%{release}
Requires: QtUiTools = %{version}-%{release}
%description linguist
@@ -1340,7 +1300,6 @@
Summary: Demos of new Qt4 features
Summary(pl.UTF-8): Programy demonstrujące nowe możliwości Qt4
Group: X11/Development/Libraries
-Requires: QtAssistant = %{version}-%{release}
Requires: QtXml = %{version}-%{release}
%description demos
@@ -1715,7 +1674,6 @@
mkdevfl phonon
# without *.la *.pc etc.
-mkdevfl QtAssistant || /bin/true
mkdevfl QtDesigner || /bin/true
mkdevfl QtUiTools || /bin/true
@@ -1754,9 +1712,6 @@
%post -n Qt3Support -p /sbin/ldconfig
%postun -n Qt3Support -p /sbin/ldconfig
-%post -n QtAssistant -p /sbin/ldconfig
-%postun -n QtAssistant -p /sbin/ldconfig
-
%post -n QtCLucene -p /sbin/ldconfig
%postun -n QtCLucene -p /sbin/ldconfig
@@ -1822,11 +1777,6 @@
%attr(755,root,root) %{_libdir}/libQt3Support.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libQt3Support.so.?
-#%files -n QtAssistant
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/libQtAssistantClient.so.*.*
-#%attr(755,root,root) %ghost %{_libdir}/libQtAssistantClient.so.?
-
%files -n QtCLucene
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libQtCLucene.so.*.*
@@ -2159,9 +2109,6 @@
%attr(755,root,root) %{_bindir}/uic3
%attr(755,root,root) %{_qtdir}/bin/uic3
-%files -n QtAssistant-devel -f QtAssistant-devel.files
-%defattr(644,root,root,755)
-
%files -n QtCore-devel -f QtCore-devel.files
%defattr(644,root,root,755)
@@ -2226,10 +2173,6 @@
%defattr(644,root,root,755)
%{_libdir}/libQt3Support.a
-#%files -n QtAssistant-static
-#%defattr(644,root,root,755)
-#%{_libdir}/libQtAssistantClient.a
-
#%files -n QtCLucene-static
#%defattr(644,root,root,755)
#%{_libdir}/libQtCLucene.a
@@ -2320,6 +2263,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.257 2010/09/22 09:20:17 shadzik
+- remove QtAssistant subpackages (obsolete)
+- add Obsoletes to QtCore-*
+
Revision 1.256 2010/09/22 06:18:54 arekm
- package QtWebKit plugin
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4.spec?r1=1.256&r2=1.257&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
