From 0977145ca979d33f36f7ca386249eb6ed2738299 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 30 Aug 2022 17:40:45 +0200 Subject: [PATCH] Update to 1.18.8, clean up SPEC file --- .gitignore | 1 + lv2.spec | 59 ++++++++++++++++++++++++++---------------------------- sources | 2 +- 3 files changed, 30 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index 3ce64db..5f095fe 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /lv2-1.18.0.tar.bz2 /lv2-1.18.2.tar.bz2 /lv2-1.18.4.tar.bz2 +/lv2-1.18.8.tar.xz diff --git a/lv2.spec b/lv2.spec index 3543623..99920d2 100644 --- a/lv2.spec +++ b/lv2.spec @@ -1,27 +1,27 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: lv2 -Version: 1.18.4 -Release: 2%{?dist} +Version: 1.18.8 +Release: 1%{?dist} Summary: Audio Plugin Standard # lv2specgen template.html is CC-AT-SA License: ISC URL: https://lv2plug.in -Source: https://lv2plug.in/spec/lv2-%{version}.tar.bz2 +Source: https://lv2plug.in/spec/lv2-%{version}.tar.xz +BuildRequires: asciidoc +Buildrequires: cairo-devel >= 1.8.10 BuildRequires: doxygen +BuildRequires: gcc-c++ BuildRequires: graphviz BuildRequires: libsndfile-devel -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: python3-devel +BuildRequires: meson +BuildRequires: pkgconfig(samplerate) BuildRequires: python3-pygments Buildrequires: python3-rdflib Buildrequires: python3-markdown Buildrequires: python3-lxml -Buildrequires: asciidoc -Buildrequires: cairo-devel >= 1.8.10 # this package replaces lv2core Provides: lv2core = 6.0-4 @@ -75,56 +75,53 @@ Documentation for the LV2 plugin API. Summary: Examples of the LV2 Audio Plugin Standard %description example-plugins -Example LV2 audio plugins +Example plugins for the LV2 Audio Plugin Standard. %prep -%setup -q +%autosetup -p1 # Fix wrong interpreter in lv2specgen.py sed -i '1s|^#!.*|#!%{__python3}|' lv2specgen/lv2specgen.py %build -%set_build_flags -%{__python3} waf configure -vv --prefix=%{_prefix} --libdir=%{_libdir} \ - --docs --docdir=%{_pkgdocdir} --lv2dir=%{_libdir}/lv2 --no-check-links -%{__python3} waf -vv %{?_smp_mflags} +%meson \ + -D docs=enabled \ + -D old_headers=false \ + -D tests=disabled + +%meson_build %install -DESTDIR=%{buildroot} %{__python3} waf -vv install -mv %{buildroot}%{_pkgdocdir}/%{name}/* %{buildroot}%{_pkgdocdir} -find %{buildroot}%{_pkgdocdir} -type d -empty | xargs rmdir -for f in COPYING NEWS README.md build/plugins/book.{txt,html} ; do - install -p -m0644 $f %{buildroot}%{_pkgdocdir} -done +%meson_install + +# Let RPM pick docs in the files section +rm -fr %{buildroot}%{_docdir}/%{name} %files -# don't include doc files via %%doc here (bz 913540) -%dir %{_pkgdocdir} -%{_pkgdocdir}/COPYING -%{_pkgdocdir}/NEWS -%{_pkgdocdir}/README.md +%license COPYING +%doc NEWS README.md %{_libdir}/%{name}/ - -%exclude %{_libdir}/%{name}/*/*.[ch] %exclude %{_libdir}/%{name}/eg-* %files devel %{_bindir}/lv2specgen.py %{_bindir}/lv2_validate %{_datadir}/lv2specgen -%{_includedir}/%{name}.h %{_includedir}/%{name}/ -%{_libdir}/%{name}/*/*.[hc] %{_libdir}/pkgconfig/%{name}.pc - %exclude %{_libdir}/%{name}/eg-* %files example-plugins %{_libdir}/%{name}/eg-* %files doc -%{_pkgdocdir}/ +%doc %{_vpath_builddir}/doc/* %changelog +* Tue Aug 30 2022 Simone Caronni - 1.18.8-1 +- Update to 1.18.8, switch to Meson. +- Update docs installation. +- Drop gcc/python-devel build requirements. + * Thu Jul 21 2022 Fedora Release Engineering - 1.18.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 4ad99d1..8604699 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lv2-1.18.4.tar.bz2) = 8095a1f3dcf70cf8cefff18c40b52c1dffeab0fe1f6bfb083c9f0e48a9617d3c8647b3f4db567ac1f5f33564399ffe1023774ad9bacb1bb0133f182422f22d6a +SHA512 (lv2-1.18.8.tar.xz) = 9925290818bd683200bc738e3e9342b946fe82a04d983e89c240ae70b9053a7a59a8d505c522fe7af5b804adeba00fdf94403bd34844ce11e26cc1ff62c2f254