Changes of Revision 60

obs-studio.changes Changed
x
 
1
@@ -1,4 +1,10 @@
2
 -------------------------------------------------------------------
3
+Fri Dec  7 00:35:35 UTC 2018 - Jimmy Berry <jimmy@boombatower.com>
4
+
5
+- Remove workaround for utilizing proper libdir as it interferes
6
+  with building plugins.
7
+
8
+-------------------------------------------------------------------
9
 Wed Nov 14 01:34:58 UTC 2018 - Jimmy Berry <jimmy@boombatower.com>
10
 
11
 - Set ExclusiveArch to i586 and x86_64.
12
obs-studio.spec Changed
56
 
1
@@ -72,16 +72,6 @@
2
 
3
 %install
4
 %cmake_install
5
-
6
-# fix lib package locations which are inconsistent since they are 64bit libs, but placed in lib/
7
-%ifarch x86_64
8
-mkdir -p %{buildroot}%{_libdir}/obs-plugins
9
-# needs obs-plugins in lib/ even though 64bit
10
-# mv %%{buildroot}/usr/lib/obs-plugins/* %%{buildroot}%%{_libdir}/obs-plugins
11
-mv %{buildroot}/usr/lib/libobs*.so* %{buildroot}%{_libdir}
12
-mv %{buildroot}/usr/lib/obs-scripting %{buildroot}%{_libdir}/obs-scripting
13
-%endif
14
-
15
 %suse_update_desktop_file obs
16
 
17
 %post
18
@@ -95,14 +85,15 @@
19
 %files
20
 %defattr(-, root, root)
21
 %{_bindir}/obs
22
-# needs obs-plugins in lib/ even though 64bit
23
+# Upstream forces libs dir regardless of arch and building plugins is encumbered
24
+# by moving them to the proper directory.
25
 %{_libexecdir}/obs-plugins
26
-%{_libdir}/libobs.so.0
27
-%{_libdir}/libobs-frontend-api.so.*
28
-%{_libdir}/libobs-opengl.so.*
29
-%{_libdir}/libobs-scripting.so
30
-%{_libdir}/obs-scripting
31
-%{_libdir}/libobsglad.so.0
32
+%{_libexecdir}/libobs.so.0
33
+%{_libexecdir}/libobs-frontend-api.so.*
34
+%{_libexecdir}/libobs-opengl.so.*
35
+%{_libexecdir}/libobs-scripting.so
36
+%{_libexecdir}/obs-scripting
37
+%{_libexecdir}/libobsglad.so.0
38
 %{_datadir}/applications/obs.desktop
39
 %{_datadir}/icons/hicolor/256x256/apps/obs.png
40
 %{_datadir}/obs
41
@@ -110,10 +101,10 @@
42
 %files devel
43
 %defattr(-, root, root)
44
 %{_libexecdir}/cmake
45
-%{_libdir}/libobs.so
46
-%{_libdir}/libobs-frontend-api.so
47
-%{_libdir}/libobs-opengl.so
48
-%{_libdir}/libobsglad.so
49
+%{_libexecdir}/libobs.so
50
+%{_libexecdir}/libobs-frontend-api.so
51
+%{_libexecdir}/libobs-opengl.so
52
+%{_libexecdir}/libobsglad.so
53
 %{_includedir}/obs
54
 
55
 %changelog
56