- qt5 support moved to phonon-qt5 package, rel 2

diff --git a/phonon.spec b/phonon.spec
index f3c30a802e367f3833d7304ce70aa33ce15b5561..87b189f2e07429b7183f6c34ee20a3bc3910f06c 100644 (file)
--- a/phonon.spec
+++ b/phonon.spec
@@ -1,17 +1,15 @@
 # NOTE: 4.10.3 is the last version with Qt4 support
 #
 # Conditional build:
-%bcond_without qt5             # do not build Qt5 version
 %bcond_without zeitgeist       # enable zeitgeist (via libqzeitgeist) supoort
 
 %define                qt4_ver         4.8.1
-%define                qt5_ver         5.3.1
 
 Summary:       Phonon: multimedia API for Qt4/KDE4
 Summary(pl.UTF-8):     Phonon - biblioteka multimedialna dla Qt4/KDE4
 Name:          phonon
 Version:       4.10.3
-Release:       1
+Release:       2
 License:       LGPL v2.1 or LGPL v3
 Group:         X11/Libraries
 Source0:       https://download.kde.org/stable/phonon/%{version}/%{name}-%{version}.tar.xz
@@ -19,19 +17,6 @@ Source0:     https://download.kde.org/stable/phonon/%{version}/%{name}-%{version}.ta
 Patch0:                %{name}-pkg.patch
 Patch1:                x32.patch
 URL:           http://phonon.kde.org/
-%if %{with qt5}
-BuildRequires: Qt5Core-devel >= %{qt5_ver}
-BuildRequires: Qt5DBus-devel >= %{qt5_ver}
-BuildRequires: Qt5Declarative-devel >= %{qt5_ver}
-BuildRequires: Qt5Designer-devel >= %{qt5_ver}
-BuildRequires: Qt5Gui-devel >= %{qt5_ver}
-BuildRequires: Qt5OpenGL-devel >= %{qt5_ver}
-BuildRequires: Qt5Qml-devel >= %{qt5_ver}
-BuildRequires: Qt5Widgets-devel >= %{qt5_ver}
-BuildRequires: qt5-build >= %{qt5_ver}
-BuildRequires: qt5-qmake >= %{qt5_ver}
-BuildRequires: kf5-extra-cmake-modules
-%endif
 BuildRequires: QtCore-devel >= %{qt4_ver}
 BuildRequires: QtDBus-devel >= %{qt4_ver}
 BuildRequires: QtDeclarative-devel >= %{qt4_ver}
@@ -108,80 +93,6 @@ Phonon plugin for Qt4 QtDeclarative library.
 %description -n QtDeclarative-plugin-phonon -l pl.UTF-8
 Wtyczka Phonon dla biblioteki Qt4 QtDeclarative.
 
-%package qt5
-Summary:       Phonon: multimedia API for Qt5/KDE5
-Summary(pl.UTF-8):     Phonon - biblioteka multimedialna dla Qt5/KDE5
-Group:         X11/Libraries
-Requires:      Qt5Core >= %{qt5_ver}
-Requires:      Qt5DBus >= %{qt5_ver}
-Requires:      Qt5Gui >= %{qt5_ver}
-Requires:      Qt5OpenGL >= %{qt5_ver}
-Requires:      Qt5Widgets >= %{qt5_ver}
-Provides:      qt5-phonon
-Obsoletes:     qt5-phonon
-
-%description qt5
-Phonon is the multimedia API for Qt5/KDE5.
-
-Phonon was originally created to allow KDE 5 to be independent of any
-single multimedia framework such as GStreamer or Xine and to provide a
-stable API for KDE5's lifetime. It was done to fix problems of
-frameworks becoming unmaintained, API instability, and to create a
-simple multimedia API.
-
-%description qt5 -l pl.UTF-8
-Phonon to biblioteka multimedialna dla Qt5/KDE5.
-
-Pierwotnie powstała, aby pozwolić na niezależność KDE 5 od konkretnego
-środowiska multimedialnego, takiego jak GStreamer czy Xine, oraz
-zapewnić stabilne API na cały czas życia KDE5. Została stworzona w
-celu wyeliminowania problemów z porzucaniem bibliotek i
-niestabilnością ich API, a także w celu stworzenia prostego API
-multimedialnego.
-
-%package qt5-devel
-Summary:       Header files for Phonon library
-Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki Phonon
-Group:         X11/Development/Libraries
-Requires:      %{name}-qt5 = %{version}-%{release}
-Requires:      Qt5Core-devel >= %{qt5_ver}
-Requires:      Qt5DBus-devel >= %{qt5_ver}
-Requires:      Qt5Gui-devel >= %{qt5_ver}
-Provides:      qt5-phonon-devel
-Obsoletes:     qt5-phonon-devel
-
-%description qt5-devel
-Header files for Phonon library.
-
-%description qt5-devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki Phonon.
-
-%package -n Qt5Declarative-plugin-phonon
-Summary:       Phonon plugin for Qt5 QtDeclarative library
-Summary(pl.UTF-8):     Wtyczka Phonon dla biblioteki Qt5 QtDeclarative
-Group:         X11/Libraries
-Requires:      %{name} = %{version}-%{release}
-Requires:      Qt5Declarative >= %{qt5_ver}
-
-%description -n Qt5Declarative-plugin-phonon
-Phonon plugin for Qt5 QtDeclarative library.
-
-%description -n Qt5Declarative-plugin-phonon -l pl.UTF-8
-Wtyczka Phonon dla biblioteki Qt5 QtDeclarative.
-
-%package -n Qt5Designer-plugin-phonon
-Summary:       Phonon plugin for Qt5 QtDesigner
-Summary(pl.UTF-8):     Wtyczka Phonon dla Qt5 QtDesignera
-Group:         X11/Libraries
-Requires:      %{name} = %{version}-%{release}
-Requires:      Qt5Designer >= %{qt5_ver}
-
-%description -n Qt5Designer-plugin-phonon
-Phonon plugin for Qt5 QtDesigner.
-
-%description -n Qt5Designer-plugin-phonon -l pl.UTF-8
-Wtyczka Phonon dla Qt5 QtDesignera.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -196,18 +107,6 @@ cd build
        -DPHONON_BUILD_DESIGNER_PLUGIN=OFF
 %{__make}
 
-cd ..
-%if %{with qt5}
-install -d build5
-cd build5
-%cmake .. \
-       -DPHONON_BUILD_DECLARATIVE_PLUGIN=ON \
-       -DPHONON_BUILD_DESIGNER_PLUGIN=ON \
-       -DPHONON_BUILD_PHONON4QT5=ON \
-       -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON
-%{__make}
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -220,13 +119,6 @@ install -d $RPM_BUILD_ROOT%{_datadir}/kde4/services/phononbackends
 ln -s ../phonon $RPM_BUILD_ROOT%{_includedir}/qt4/phonon
 ln -s ../KDE/Phonon $RPM_BUILD_ROOT%{_includedir}/phonon/Phonon
 
-%if %{with qt5}
-%{__make} -C build5 install \
-       DESTDIR=$RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT%{_libdir}/qt5/plugins/phonon4qt5_backend
-%endif
-
 %find_lang libphonon_qt --with-qm
 
 %clean
@@ -235,9 +127,6 @@ rm -rf $RPM_BUILD_ROOT
 %post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
 
-%post  qt5 -p /sbin/ldconfig
-%postun        qt5 -p /sbin/ldconfig
-
 %files -f libphonon_qt.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libphonon.so.*.*.*
@@ -268,35 +157,3 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/qt4/imports/Phonon/libphononqmlplugin.so
 %{_libdir}/qt4/imports/Phonon/VideoPlayer.qml
 %{_libdir}/qt4/imports/Phonon/qmldir
-
-%if %{with qt5}
-%files qt5
-%defattr(644,root,root,755)
-%attr(755,root,root) %ghost %{_libdir}/libphonon4qt5.so.4
-%attr(755,root,root) %{_libdir}/libphonon4qt5.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libphonon4qt5experimental.so.4
-%attr(755,root,root) %{_libdir}/libphonon4qt5experimental.so.*.*.*
-%dir %{_libdir}/qt5/plugins/phonon4qt5_backend
-%{_datadir}/dbus-1/interfaces/org.kde.Phonon4Qt5.AudioOutput.xml
-%{_datadir}/phonon4qt5
-
-%files qt5-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libphonon4qt5.so
-%attr(755,root,root) %{_libdir}/libphonon4qt5experimental.so
-%{_includedir}/phonon4qt5
-%{_pkgconfigdir}/phonon4qt5.pc
-%{_libdir}/cmake/phonon4qt5
-%{_libdir}/qt5/mkspecs/modules/qt_phonon4qt5.pri
-
-%files -n Qt5Declarative-plugin-phonon
-%defattr(644,root,root,755)
-%dir %{_libdir}/qt5/imports/Phonon
-%attr(755,root,root) %{_libdir}/qt5/imports/Phonon/phononqmlplugin.so
-%{_libdir}/qt5/imports/Phonon/VideoPlayer.qml
-%{_libdir}/qt5/imports/Phonon/qmldir
-
-%files -n Qt5Designer-plugin-phonon
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/qt5/plugins/designer/phononwidgets.so
-%endif