From a5b6a8dae7cf1f87cd281c2cb032bb84a09787b6 Mon Sep 17 00:00:00 2001
From: Martin Gansser <mgansser@online.de>
Date: Mon, 21 Feb 2022 08:32:09 +0100
Subject: [PATCH] Update to 2.4.2

Add Carla-single-libs-path.patch
---
 .gitignore                   |  1 +
 Carla-single-libs-path.patch | 14 ++++++++++++++
 Carla.spec                   | 22 +++++++++++++---------
 sources                      |  2 +-
 4 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 Carla-single-libs-path.patch

diff --git a/.gitignore b/.gitignore
index 4236ff3..40ba082 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /Carla-2.3.2.tar.gz
 /Carla-2.4.0.tar.gz
 /Carla-2.4.1.tar.gz
+/Carla-2.4.2.tar.gz
diff --git a/Carla-single-libs-path.patch b/Carla-single-libs-path.patch
new file mode 100644
index 0000000..23004d7
--- /dev/null
+++ b/Carla-single-libs-path.patch
@@ -0,0 +1,14 @@
+--- data/carla-single	2018-09-06 09:49:37.310950156 +1000
++++ data/carla-single	2019-09-25 16:36:23.365683884 +1000
+@@ -25,9 +25,9 @@
+ # --------------------------------------------------------------------------------------------------------
+ # Setup
+ 
+-INSTALL_PREFIX = "X-PREFIX-X"
++INSTALL_PREFIX = "/usr"
+ 
+-CARLA_LIBDIR = os.path.join(INSTALL_PREFIX, "lib", "carla")
++CARLA_LIBDIR = os.path.join(INSTALL_PREFIX, "lib64", "carla")
+ CARLA_RESDIR = os.path.join(INSTALL_PREFIX, "share", "carla", "resources")
+ 
+ # --------------------------------------------------------------------------------------------------------
diff --git a/Carla.spec b/Carla.spec
index a6046c4..35945ef 100644
--- a/Carla.spec
+++ b/Carla.spec
@@ -1,8 +1,8 @@
 %global pname   carla
 
 Name:           Carla
-Version:        2.4.1
-Release:        3%{?dist}
+Version:        2.4.2
+Release:        1%{?dist}
 Summary:        Audio plugin host
 
 # The entire source code is GPLv2+ except
@@ -51,10 +51,10 @@ Epoch:   1
 License:        GPLv2+ and BSD and Boost and ISC and MIT and zlib
 URL:            https://github.com/falkTX/Carla
 Source0:        https://github.com/falkTX/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Source1:        carla.appdata.xml
 # https://github.com/falkTX/Carla/issues/1444
 Patch0:         %{name}-libdir.patch
 Patch1:         %{name}-expression-error.patch
+Patch2:         %{name}-single-libs-path.patch
 
 #ExcludeArch:    ppc64le
 
@@ -155,6 +155,10 @@ sed -i "s|#!/usr/bin/env python|#!%{__python3}|" source/frontend/widgets/paramsp
 # fix libdir path
 sed -i "s|/lib/carla|/%{_lib}/carla|" data/{carla,carla-control,carla-database,carla-jack-multi,carla-jack-single,carla-patchbay,carla-rack,carla-settings}
 
+# Fix metainfo install dir
+sed -i -e 's|$(DESTDIR)$(PREFIX)/share/appdata/studio.kx.carla.appdata.xml|$(DESTDIR)$(PREFIX)/share/metainfo/studio.kx.carla.appdata.xml|g' Makefile
+sed -i -e 's|$(DESTDIR)$(PREFIX)/share/appdata|$(DESTDIR)$(PREFIX)/share/metainfo|g' Makefile
+
 %build
 %{set_build_flags}
 # list build configuration, no need for optflags or -j
@@ -176,13 +180,9 @@ chmod a+x %{buildroot}%{_datadir}/%{pname}/{carla,carla-control,carla-jack-multi
 # fix perm due rpmlint W: unstripped-binary-or-object /usr/lib64/carla/libcarla_interposer-jack-x11.so
 find %{buildroot}%{_libdir} -name '*.so' -exec chmod +x '{}' ';'
 
-# Install appdata file
-mkdir -p %{buildroot}%{_datadir}/metainfo
-install -p -m 0644 %SOURCE1 %{buildroot}%{_datadir}/metainfo
-
 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{pname}.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/studio.kx.carla.appdata.xml
 
 %files
 %doc README.md
@@ -209,7 +209,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{pname}.
 %{_datadir}/icons/hicolor/*/apps/%{pname}*.png
 %{_datadir}/icons/hicolor/*/apps/%{pname}*.svg
 %{_datadir}/mime/packages/%{pname}.xml
-%{_datadir}/metainfo/%{pname}.appdata.xml
+%{_datadir}/metainfo/studio.kx.carla.appdata.xml
 
 %files vst
 %{_libdir}/vst/
@@ -226,6 +226,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{pname}.
 %{_libdir}/pkgconfig/%{pname}-host-plugin.pc
 
 %changelog
+* Sun Feb 20 2022 Martin Gansser <martinkg@fedoraproject.org> - 1:2.4.2-1
+- Update to 2.4.2
+- Add Carla-single-libs-path.patch
+
 * Sat Jan 29 2022 Martin Gansser <martinkg@fedoraproject.org> - 1:2.4.1-3
 - Add Carla-expression-error.patch
 
diff --git a/sources b/sources
index 31332e7..54fe682 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Carla-2.4.1.tar.gz) = cebb66de09337a6ce2ecb80ab3cacf57b74bb41b03edeca42059c037e45773991b0eabe53bd58aba1d334df7c87f778b32c6ae7740eb66227840def94a5d460e
+SHA512 (Carla-2.4.2.tar.gz) = 70b53ed681565a59398b3626c5aff2ccd46c6fe55c6f22796408d0b851620e6f0a502b6122df10a189d7706ca9baf471bbc735c14eacf610f3257ec0409eae65