From 6f7b34fd1e90f2fb47b49fca1cf6a95016294f80d09d006022031a7917f6f7df Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Sun, 11 Oct 2015 09:29:39 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/qmmp?expand=0&rev=66 --- baselibs.conf | 2 -- qmmp.changes | 2 ++ qmmp.spec | 23 ++++++++++++----------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 024cbfd..948024c 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1 @@ libqmmp1 -libqmmp1-plugins -libqmmp1-plugin-mplayer diff --git a/qmmp.changes b/qmmp.changes index 093769b..05bc807 100644 --- a/qmmp.changes +++ b/qmmp.changes @@ -16,6 +16,8 @@ Fri Oct 2 19:26:50 UTC 2015 - sor.alexei@meowr.ru * Fix effects and decoders sorting. * Fix possible race condition. * Update Greek translation. +- Rename libqmmp1-plugins to libqmmp-plugins: can't be + multiversioned. ------------------------------------------------------------------- Sun Sep 6 10:32:23 UTC 2015 - sor.alexei@meowr.ru diff --git a/qmmp.spec b/qmmp.spec index 8019d95..aed4d91 100644 --- a/qmmp.spec +++ b/qmmp.spec @@ -89,32 +89,33 @@ has user interface, similar winamp or xmms. %package -n libqmmp%{sover} Summary: Qmmp library Group: System/Libraries -Recommends: libqmmp%{sover}-plugins +Recommends: libqmmp-plugins %description -n libqmmp%{sover} Qmmp library. -%package -n libqmmp%{sover}-plugins +%package -n libqmmp-plugins Summary: Plugins for libqmmp Group: System/Libraries # Suggests instead of Recommends since MPlayer is a too big dependency. -Suggests: libqmmp%{sover}-plugin-mplayer -# qmmp-plugin-pack-simple-ui was last used in openSUSE 13.2 (in PMBS). +Suggests: libqmmp-plugin-mplayer +# libqmmp0-plugins & qmmp-plugin-pack-simple-ui were last used in openSUSE 13.2 (in PMBS). +Obsoletes: libqmmp0-plugins Obsoletes: qmmp-plugin-pack-simple-ui < {version} Provides: qmmp-plugin-pack-simple-ui = %{version} Provides: qmmp(%{sover})(Input) Provides: qmmp(%{sover})(Output) Provides: qmmp(%{sover})(Ui) -%description -n libqmmp%{sover}-plugins +%description -n libqmmp-plugins Plugins for libqmmp. -%package -n libqmmp%{sover}-plugin-mplayer +%package -n libqmmp-plugin-mplayer Summary: MPlayer plugin for libqmmp Group: System/Libraries Requires: %{_bindir}/mplayer -%description -n libqmmp%{sover}-plugin-mplayer +%description -n libqmmp-plugin-mplayer MPlayer plugin for libqmmp. %package -n libqmmp-devel @@ -163,10 +164,10 @@ popd %postun -n libqmmp%{sover} -p /sbin/ldconfig -%post -n libqmmp%{sover}-plugins +%post -n libqmmp-plugins %desktop_database_post -%postun -n libqmmp%{sover}-plugins +%postun -n libqmmp-plugins %desktop_database_postun %files @@ -184,12 +185,12 @@ popd %{_libdir}/libqmmp.so.%{sover}* %{_libdir}/libqmmpui.so.%{sover}* -%files -n libqmmp%{sover}-plugins +%files -n libqmmp-plugins %defattr(-,root,root) %{_libdir}/qmmp/ %exclude %{_libdir}/qmmp/Engines/libmplayer.so -%files -n libqmmp%{sover}-plugin-mplayer +%files -n libqmmp-plugin-mplayer %defattr(-,root,root) %dir %{_libdir}/qmmp/ %dir %{_libdir}/qmmp/Engines/