commit 021ce6fb7f5ffc00e648d23cec653149253a18cf Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Fri Jul 24 10:52:33 2020 +0100 Revert "Improve compatibility with new CMake macro" This reverts commit c6cb79576a715123f77e1f86d5282d35b5624d6a. plex-media-player.spec | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) --- diff --git a/plex-media-player.spec b/plex-media-player.spec index 34b5fe1..6cd22c7 100644 --- a/plex-media-player.spec +++ b/plex-media-player.spec @@ -1,5 +1,3 @@ -%undefine __cmake_in_source_build - %global plex_hash 2.58.0.1076-38e019da %global clients_hash 183-045db5be50e175 %global web_client_desktop 4.29.2-e50e175 @@ -8,7 +6,7 @@ Name: plex-media-player Version: 2.58.0 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Plex Media Player License: GPLv2+ @@ -99,27 +97,29 @@ Player in TV mode at boot for HTPC installations. %build rm -Rf build -mkdir -p dependencies -install -p %{SOURCE90} dependencies/buildid-%{clients_hash}.cmake -install -p %{SOURCE91} %{SOURCE92} %{SOURCE93} %{SOURCE94} dependencies/ +mkdir -p build/dependencies +install -p %{SOURCE90} build/dependencies/buildid-%{clients_hash}.cmake +install -p %{SOURCE91} %{SOURCE92} %{SOURCE93} %{SOURCE94} build/dependencies/ +cd build %cmake3 \ -GNinja \ -DOpenGL_GL_PREFERENCE=GLVND \ -DQTROOT=%{_qt5_prefix} \ -DMPV_INCLUDE_DIR=%{_includedir}/mpv \ -DLINUX_DBUS=ON \ - -DLINUX_X11POWER=ON + -DLINUX_X11POWER=ON \ + .. -%cmake3_build +%ninja_build %install -%cmake3_install +%ninja_install -C build mkdir -p %{buildroot}%{_bindir} -install -pm0755 %{_vpath_builddir}/src/plexmediaplayer %{buildroot}%{_bindir}/plexmediaplayer -install -pm0755 %{_vpath_builddir}/src/pmphelper %{buildroot}%{_bindir}/pmphelper +install -pm0755 build/src/plexmediaplayer %{buildroot}%{_bindir}/plexmediaplayer +install -pm0755 build/src/pmphelper %{buildroot}%{_bindir}/pmphelper install -pm0755 %{SOURCE6} %{buildroot}%{_bindir}/plexmediaplayer-standalone mkdir -p %{buildroot}%{_metainfodir}/ @@ -206,9 +206,6 @@ exit 0 %{_unitdir}/%{name}.target %changelog -* Thu Jul 23 2020 Leigh Scott <leigh123linux(a)gmail.com&gt; - 2.58.0-2 -- Improve compatibility with new CMake macro - * Tue May 26 2020 Leigh Scott <leigh123linux(a)gmail.com&gt; - 2.58.0-1 - Update to 2.58.0