From 6fa3401088bf3d137fda6bad31e9b581efda59e4 Mon Sep 17 00:00:00 2001
From: Guido Aulisi <guido.aulisi@gmail.com>
Date: Sun, 4 Oct 2020 14:33:21 +0200
Subject: [PATCH] Update to 0.24.10

Run new test suite
---
 .gitignore             |  1 +
 lilv-test-python.patch | 13 +++++++++++++
 lilv.spec              | 21 ++++++++++++++-------
 sources                |  2 +-
 4 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 lilv-test-python.patch

diff --git a/.gitignore b/.gitignore
index f9ccf8a..ba3f53f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /lilv-0.24.4.tar.bz2
 /lilv-0.24.6.tar.bz2
 /lilv-0.24.8.tar.bz2
+/lilv-0.24.10.tar.bz2
diff --git a/lilv-test-python.patch b/lilv-test-python.patch
new file mode 100644
index 0000000..d3c9b02
--- /dev/null
+++ b/lilv-test-python.patch
@@ -0,0 +1,13 @@
+diff --git a/wscript b/wscript
+index f6780d0..bed2995 100644
+--- a/wscript
++++ b/wscript
+@@ -570,7 +570,7 @@ def test(tst):
+ 
+     if tst.env.LILV_PYTHON:
+         with tst.group('python') as check:
+-            check(['python', '-m', 'unittest', 'discover', 'bindings/'])
++            check(['python3', '-m', 'unittest', 'discover', 'bindings/'])
+ 
+     with tst.group('plugin') as check:
+         for p in test_plugins:
diff --git a/lilv.spec b/lilv.spec
index 1c293f2..f8c6552 100644
--- a/lilv.spec
+++ b/lilv.spec
@@ -2,13 +2,16 @@
 %global maj 0
 
 Name:       lilv
-Version:    0.24.8
+Version:    0.24.10
 Release:    1%{?dist}
 Summary:    An LV2 Resource Description Framework Library
 
 License:    MIT
 URL:        http://drobilla.net/software/lilv/
 Source0:    http://download.drobilla.net/%{name}-%{version}.tar.bz2
+# New test suite looks for unversioned python
+Patch0:     %{name}-test-python.patch
+
 BuildRequires:  doxygen
 BuildRequires:  graphviz
 BuildRequires:  sord-devel >= 0.14.0
@@ -50,8 +53,8 @@ supports reading and writing Turtle and NTriples.
 This package contains the python libraries for %{name}.
 
 %prep
-%setup -q 
-# we'll run ld config
+%autosetup -p1
+# Do not run ld config
 sed -i -e 's|bld.add_post_fun(autowaf.run_ldconfig)||' wscript
 # for packagers sake, build the tests with debug symbols
 sed -i -e "s|'-ftest-coverage'\]|\
@@ -60,18 +63,18 @@ sed -i -e "s|'-ftest-coverage'\]|\
 %build
 %set_build_flags
 export LINKFLAGS="%{__global_ldflags}"
-python3 waf configure -v --prefix=%{_prefix} \
+%{python3} waf configure -v --prefix=%{_prefix} \
  --libdir=%{_libdir} --configdir=%{_sysconfdir} --mandir=%{_mandir} \
  --docdir=%{_pkgdocdir} \
  --docs --test --dyn-manifest
-python3 waf -v build %{?_smp_mflags}
+%{python3} waf -v build %{?_smp_mflags}
 
 %install
-python3 waf -v install --destdir=%{buildroot}
+%{python3} waf -v install --destdir=%{buildroot}
 chmod +x %{buildroot}%{_libdir}/lib%{name}-0.so.*
 
 %check
-./build/test/lilv_test
+%{python3} waf test
 
 %files
 %doc AUTHORS NEWS README.md
@@ -98,6 +101,10 @@ chmod +x %{buildroot}%{_libdir}/lib%{name}-0.so.*
 %{python3_sitelib}/__pycache__/*
 
 %changelog
+* Sun Oct 04 2020 Guido Aulisi <guido.aulisi@gmail.com> - 0.24.10-1
+- Update to 0.24.10
+- Run new test suite
+
 * Wed Aug 19 2020 Guido Aulisi <guido.aulisi@gmail.com> - 0.24.8-1
 - Update to 0.24.8
 
diff --git a/sources b/sources
index f2adb49..15ab5af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lilv-0.24.8.tar.bz2) = f2b2638372a8280041f6e88e2077f2109f89dad6feedb9d07a88c6b5a05c37b62112f5d03282da4335ddd0d14339cfb49ad96a3df3de310265a40c24718be192
+SHA512 (lilv-0.24.10.tar.bz2) = 1dfd4fef19537686b63a4e7df45e3b1a7c4a658acc21d5646daba4d3bd5676513857b3f437b89f1a06232516433ef155772d19625c33d49d13ada37a965982cf