From 75640e5ae347b678430c29c35c7f285d06cc6851 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Thu, 7 Feb 2019 09:30:12 +0100
Subject: [PATCH 1/2] Fix update-alternatives macro expansion in flatpak module
 builds

Avoid using %{_sbindir}/update-alternatives in requires and scriptlets
as it expands to /app/sbin/update-alternatives when building flatpak
modules and not to /usr/sbin where the binary is actually installed in.
---
 wxGTK3.spec | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/wxGTK3.spec b/wxGTK3.spec
index e5570de..02f4e8e 100644
--- a/wxGTK3.spec
+++ b/wxGTK3.spec
@@ -87,8 +87,8 @@ ranging from networking to HTML display and image manipulation.
 Group:          Development/Libraries
 Summary:        Development files for the wxBase3 library
 Requires:       %{wxbasename}%{?_isa} = %{version}-%{release}
-Requires(post): %{_sbindir}/update-alternatives
-Requires(postun): %{_sbindir}/update-alternatives
+Requires(post): /usr/sbin/update-alternatives
+Requires(postun): /usr/sbin/update-alternatives
 
 %description -n %{wxbasename}-devel
 This package include files needed to link with the wxBase3 library.
@@ -388,15 +388,15 @@ popd
 if [ -f %{_bindir}/wx-config ] && [ ! -h %{_bindir}/wx-config ] ; then
   rm %{_bindir}/wx-config
 fi
-%{_sbindir}/update-alternatives --install %{_bindir}/wx-config \
+/usr/sbin/update-alternatives --install %{_bindir}/wx-config \
   wx-config %{_libexecdir}/%{name}/wx-config 3
-%{_sbindir}/update-alternatives --install %{_bindir}/wxrc \
+/usr/sbin/update-alternatives --install %{_bindir}/wxrc \
   wxrc %{_libexecdir}/%{name}/wxrc 3
 
 %postun -n %{wxbasename}-devel
 if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove wx-config %{_libexecdir}/%{name}/wx-config
-  %{_sbindir}/update-alternatives --remove wxrc %{_libexecdir}/%{name}/wxrc
+  /usr/sbin/update-alternatives --remove wx-config %{_libexecdir}/%{name}/wx-config
+  /usr/sbin/update-alternatives --remove wxrc %{_libexecdir}/%{name}/wxrc
 fi
 
 %files

From 0e58a8839c26f525e437313880a9efeb8fbe6312 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 8 Feb 2019 09:14:44 +0100
Subject: [PATCH 2/2] Avoid hardcoding the prefix in wx-config

When building flatpak modules, the prefix is /app and hardcoding /usr
no longer works.
---
 wxGTK3.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wxGTK3.spec b/wxGTK3.spec
index 02f4e8e..2550c3f 100644
--- a/wxGTK3.spec
+++ b/wxGTK3.spec
@@ -354,6 +354,7 @@ popd
 rm %{buildroot}%{_bindir}/wx-config
 ##Install new and symlink
 install -p -D -m 755 %{SOURCE10} %{buildroot}%{_libexecdir}/%{name}/wx-config
+sed -i -e 's|=/usr|=%{_prefix}|' %{buildroot}%{_libexecdir}/%{name}/wx-config
 ln -s ../..%{_libexecdir}/%{name}/wx-config %{buildroot}%{_bindir}/wx-config-3.0
 touch %{buildroot}%{_bindir}/wx-config