since no 4.4.1-1 build exists yet, forward port

Tue Aug 05 2008 Rex Dieter <rdieter@fedoraproject.org> 4.4.0-17
- fold -sqlite subpkg into main (#454930)
This commit is contained in:
Rex Dieter 2008-08-06 03:18:59 +00:00
parent 9e444df86a
commit 0ead5f67ab
1 changed files with 10 additions and 22 deletions

32
qt.spec
View File

@ -144,8 +144,12 @@ BuildRequires: sqlite-devel
Obsoletes: qt4-config < %{version}-%{release}
Provides: qt4-config = %{version}-%{release}
## libQtScript Obsoletes libqsa ?
# Obsoletes: qt4-qsa
Obsoletes: qt4-sqlite < %{version}-%{release}
Provides: qt4-sqlite = %{version}-%{release}
%if "%{name}" == "qt"
Obsoletes: qt-sqlite < %{version}-%{release}
Provides: qt-sqlite = %{version}-%{release}
%endif
%description
Qt is a software toolkit for developing applications.
@ -239,20 +243,6 @@ Provides: qt4-postgresql = %{version}-%{release}
%description postgresql
%{summary}.
%package sqlite
Summary: SQLite driver for Qt's SQL classes
Group: System Environment/Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: qt4-SQLite < %{version}-%{release}
Provides: qt4-SQLite = %{version}-%{release}
%if "%{name}" != "qt4"
Obsoletes: qt4-sqlite < %{version}-%{release}
Provides: qt4-sqlite = %{version}-%{release}
%endif
%description sqlite
%{summary}.
%package x11
Summary: Qt GUI-related libraries
Group: System Environment/Libraries
@ -606,6 +596,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%{_qt4_libdir}/libQtXmlPatterns.so.*
%dir %{_qt4_plugindir}
%dir %{_qt4_plugindir}/sqldrivers/
%{_qt4_plugindir}/sqldrivers/libqsqlite*
%{_qt4_translationdir}/
%files x11
@ -732,17 +723,14 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%{_qt4_plugindir}/sqldrivers/libqsqlmysql*
%endif
%if "%{?sqlite}" == "-plugin-sql-sqlite"
%files sqlite
%defattr(-,root,root,-)
%{_qt4_plugindir}/sqldrivers/libqsqlite*
%endif
%changelog
* Tue Aug 05 2008 Than Ngo <than@redhat.com> - 4.4.1-1
- 4.4.1
* Tue Aug 05 2008 Rex Dieter <rdieter@fedoraproject.org> 4.4.0-17
- fold -sqlite subpkg into main (#454930)
* Wed Jul 23 2008 Rex Dieter <rdieter@fedoraproject.org> 4.4.0-16
- qt-copy-patches-20080723 (kde#162793)
- omit deprecated phonon bits