From 5babe9e03cd30fdd70e5aa2ef7398d48e5db1ef786e1a66eb6cb93183f7f56aa Mon Sep 17 00:00:00 2001
From: Dave Plater <davejplater@gmail.com>
Date: Tue, 15 Dec 2015 12:21:04 +0000
Subject: [PATCH] Accepting request 348964 from home:plater

Fixed plugin in unversioned lib dir

OBS-URL: https://build.opensuse.org/request/show/348964
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/buzztrax?expand=0&rev=8
---
 buzztrax-songio-dir.patch | 13 +++++++++++++
 buzztrax.changes          |  2 ++
 buzztrax.spec             | 30 ++++++++++++++++++++----------
 3 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100644 buzztrax-songio-dir.patch

diff --git a/buzztrax-songio-dir.patch b/buzztrax-songio-dir.patch
new file mode 100644
index 0000000..061b015
--- /dev/null
+++ b/buzztrax-songio-dir.patch
@@ -0,0 +1,13 @@
+Index: Makefile.in
+===================================================================
+--- Makefile.in.orig
++++ Makefile.in
+@@ -2066,7 +2066,7 @@ libbuzztrax_core_HEADERS = \
+ 
+ 
+ # -- songio plugins
+-songiodir = ${exec_prefix}/lib/buzztrax-songio
++songiodir = ${libdir}/buzztrax-songio
+ songio_LTLIBRARIES = libbtbsl.la
+ libbtbsl_la_LIBADD = \
+   libbuzztrax-core.la \
diff --git a/buzztrax.changes b/buzztrax.changes
index f435a2c..e0e3572 100644
--- a/buzztrax.changes
+++ b/buzztrax.changes
@@ -3,6 +3,8 @@ Tue Dec 15 11:10:24 UTC 2015 - davejplater@gmail.com
 
 - Fixed i586 build with buzztrax-fixx86build.patch and
   buzztrax-nolibbml_la-bmlw.patch
+- Created buzztrax-songio-dir.patch to make the plugin install into
+  the versioned lib directory and moved it to plugins package.
 
 -------------------------------------------------------------------
 Mon Dec 14 08:46:22 UTC 2015 - davejplater@gmail.com
diff --git a/buzztrax.spec b/buzztrax.spec
index 23886ff..baf45c7 100644
--- a/buzztrax.spec
+++ b/buzztrax.spec
@@ -35,11 +35,13 @@ Group:          Productivity/Multimedia/Sound/Utilities
 Url:            http://sourceforge.net/projects/buzztard/
 Source0:        %{name}-%{version}.tar.gz
 Source1:        COPYING-DOCS
+# The buzztrack songio plugin installs in the unversioned _libexecdir.
+Patch0:         buzztrax-songio-dir.patch
 %ifarch i586
 # Suppress sse flags for 32 bit build.
-Patch0:         buzztrax-fixx86build.patch
+Patch1:         buzztrax-fixx86build.patch
 # Set calling mode to void for 32 bit build.
-Patch1:         buzztrax-nolibbml_la-bmlw.patch
+Patch2:         buzztrax-nolibbml_la-bmlw.patch
 %endif
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
@@ -184,9 +186,10 @@ This package contains buzztrax plugins
 
 %prep
 %setup -q
-%ifarch i586
 %patch0
+%ifarch i586
 %patch1
+%patch2
 %endif
 cp -v %{S:1} .
 #rm -rf src/lib/dllwrapper
@@ -207,7 +210,7 @@ make %{?_smp_flags}
 %install
 %make_install
 # NOTE: There's libraries installed in unversioned libdir must investigate
-find %{buildroot}%{_libdir} %{buildroot}%{_libexecdir} -name '*.la' -delete
+find %{buildroot}%{_libdir} -name '*.la' -delete
 echo %{buildroot}
 %find_lang %{name}-%{version}
 #%%find_gconf_schemas
@@ -241,6 +244,14 @@ typelib-1_0-BuzztraxCore-1_1\n
 %icon_theme_cache_postun gnome
 %icon_theme_cache_postun
 
+%post plugins
+%mime_database_post
+%desktop_database_post
+
+%postun plugins
+%desktop_database_postun
+%mime_database_postun
+
 %post -n libbuzztrax-ic%{ic_soname} -p /sbin/ldconfig
 %post -n libbuzztrax-core%{core_soname} -p /sbin/ldconfig
 %post -n libbuzztrax-gst%{gst_soname} -p /sbin/ldconfig
@@ -271,14 +282,10 @@ typelib-1_0-BuzztraxCore-1_1\n
 %attr(0644,root,root) %ghost %{_datadir}/mime/audio/x-bzt.xml
 %attr(0644,root,root) %ghost %{_datadir}/mime/audio/x-bzt-xml.xml
 # NOTE: These files need a proper home and correct handling.
-%dir %{_libexecdir}/buzztrax-songio
-%{_libexecdir}/buzztrax-songio/libbtbsl.so
 %{_datadir}/GConf/gsettings/buzztrax.convert
 %dir %{_datadir}/appdata
 %{_datadir}/appdata/buzztrax.appdata.xml
-%{_datadir}/applications/buzztrax-songio-buzz.desktop
 %{_datadir}/glib-2.0/schemas/org.buzztrax.gschema.xml
-%{_datadir}/mime/packages/buzztrax-songio-buzz.xml
 
 %files -n gstreamer-1_0-plugins
 %defattr(0644,root,root,0755)
@@ -343,7 +350,10 @@ typelib-1_0-BuzztraxCore-1_1\n
 
 %files plugins
 %defattr(0644,root,root,0755)
-%{_libdir}/%{name}/
-
+%{_libdir}/%{name}/*.so
+%{_datadir}/applications/buzztrax-songio-buzz.desktop
+%{_datadir}/mime/packages/buzztrax-songio-buzz.xml
+%dir %{_libdir}/buzztrax-songio
+%{_libdir}/buzztrax-songio/*.so
 
 %changelog