Packman Build Service PMBS

Changes of Revision 60

obs-studio.changes Changed

obs-studio.spec Changed

@@ -72,16 +72,6 @@
 
 %install
 %cmake_install
-
-# fix lib package locations which are inconsistent since they are 64bit libs, but placed in lib/
-%ifarch x86_64
-mkdir -p %{buildroot}%{_libdir}/obs-plugins
-# needs obs-plugins in lib/ even though 64bit
-# mv %%{buildroot}/usr/lib/obs-plugins/* %%{buildroot}%%{_libdir}/obs-plugins
-mv %{buildroot}/usr/lib/libobs*.so* %{buildroot}%{_libdir}
-mv %{buildroot}/usr/lib/obs-scripting %{buildroot}%{_libdir}/obs-scripting
-%endif
-
 %suse_update_desktop_file obs
 
 %post
@@ -95,14 +85,15 @@
 %files
 %defattr(-, root, root)
 %{_bindir}/obs
-# needs obs-plugins in lib/ even though 64bit
+# Upstream forces libs dir regardless of arch and building plugins is encumbered
+# by moving them to the proper directory.
 %{_libexecdir}/obs-plugins
-%{_libdir}/libobs.so.0
-%{_libdir}/libobs-frontend-api.so.*
-%{_libdir}/libobs-opengl.so.*
-%{_libdir}/libobs-scripting.so
-%{_libdir}/obs-scripting
-%{_libdir}/libobsglad.so.0
+%{_libexecdir}/libobs.so.0
+%{_libexecdir}/libobs-frontend-api.so.*
+%{_libexecdir}/libobs-opengl.so.*
+%{_libexecdir}/libobs-scripting.so
+%{_libexecdir}/obs-scripting
+%{_libexecdir}/libobsglad.so.0
 %{_datadir}/applications/obs.desktop
 %{_datadir}/icons/hicolor/256x256/apps/obs.png
 %{_datadir}/obs
@@ -110,10 +101,10 @@
 %files devel
 %defattr(-, root, root)
 %{_libexecdir}/cmake
-%{_libdir}/libobs.so
-%{_libdir}/libobs-frontend-api.so
-%{_libdir}/libobs-opengl.so
-%{_libdir}/libobsglad.so
+%{_libexecdir}/libobs.so
+%{_libexecdir}/libobs-frontend-api.so
+%{_libexecdir}/libobs-opengl.so
+%{_libexecdir}/libobsglad.so
 %{_includedir}/obs
 
 %changelog