diff --git a/.gitignore b/.gitignore index 57a6a3d..0e911ee 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /sratom-0.6.6.tar.bz2 /sratom-0.6.8.tar.bz2 /sratom-0.6.10.tar.bz2 +/sratom-0.6.14.tar.xz diff --git a/sources b/sources index 25a951a..54ae0da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sratom-0.6.10.tar.bz2) = cc5d2848d61de45a37d1f844b2c741016decf065bcac975214dd01108171ba332f0a51526f2f1078d5f501055af0a48716704515cbe7a9f73526fd878621ca4b +SHA512 (sratom-0.6.14.tar.xz) = 3647ccca3ac98299a0bcc30d540788c627445c9a55f0b68a53e08ee45b15138c7a5466c92d1c10eac614325718d4f59eff6f0664f99891e8349e613be675c87d diff --git a/sratom-doc-install-directory.patch b/sratom-doc-install-directory.patch deleted file mode 100644 index c91c9bf..0000000 --- a/sratom-doc-install-directory.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/wscript b/wscript -index 7bbf300..abdb163 100644 ---- a/wscript -+++ b/wscript -@@ -174,6 +174,7 @@ def build(bld): - - # Documentation - if bld.env.DOCS: -+ bld.env.SRATOM_MAJOR_VERSION = SRATOM_MAJOR_VERSION - bld.recurse('doc/c') - - bld.add_post_fun(autowaf.run_ldconfig) diff --git a/sratom.spec b/sratom.spec index f2d1632..90f9618 100644 --- a/sratom.spec +++ b/sratom.spec @@ -1,19 +1,15 @@ %global maj 0 -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: sratom -Version: 0.6.10 -Release: 3%{?dist} +Version: 0.6.14 +Release: 1%{?dist} Summary: A C library for serializing LV2 plugins License: MIT -URL: http://drobilla.net/software/%{name}/ -Source0: http://download.drobilla.net/%{name}-%{version}.tar.bz2 +URL: https://drobilla.net/software/%{name}/ +Source0: https://download.drobilla.net/%{name}-%{version}.tar.xz -# Patch sent upstream https://github.com/lv2/sratom/pull/4 -Patch0: %{name}-doc-install-directory.patch - -BuildRequires: python3 +BuildRequires: meson BuildRequires: doxygen BuildRequires: graphviz BuildRequires: sord-devel >= 0.14.0 @@ -46,44 +42,36 @@ This package contains the headers and development libraries for %{name}. %prep %autosetup -p1 -# for packagers sake, build the tests with debug symbols -sed -i -e "s| '-ftest-coverage'\]|\ - '-ftest-coverage'\] + '%{optflags}'.split(' ')|" wscript - %build -%set_build_flags -%{python3} waf configure -v \ - --prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --datadir=%{_datadir} \ - --docdir=%{_pkgdocdir} \ - --test \ - --docs -%{python3} waf build -v %{?_smp_mflags} +%meson +%meson_build %install -DESTDIR=%{buildroot} %{python3} waf install -chmod +x %{buildroot}%{_libdir}/lib%{name}-0.so.* -install -pm 644 COPYING NEWS README.md %{buildroot}%{_pkgdocdir} +%meson_install +# Delete sphinx buildinfo +rm %{buildroot}%{_docdir}/%{name}-%{maj}/{html,singlehtml}/.buildinfo +# Move devel docs to the right directory +install -d %{buildroot}%{_docdir}/%{name} +mv %{buildroot}%{_docdir}/%{name}-%{maj} %{buildroot}%{_docdir}/%{name} %check -%{python3} waf test -v +%meson_test %files -%{_pkgdocdir} -%exclude %{_pkgdocdir}/%{name}-%{maj}/ -%exclude %{_pkgdocdir}/COPYING +%doc README.md %license COPYING %{_libdir}/lib%{name}-%{maj}.so.* %files devel -%{_pkgdocdir}/%{name}-%{maj}/ +%doc %{_docdir}/%{name}/%{name}-%{maj}/ %{_libdir}/lib%{name}-%{maj}.so %{_libdir}/pkgconfig/%{name}-%{maj}.pc %{_includedir}/%{name}-%{maj}/ %changelog +* Mon May 22 2023 Guido Aulisi - 0.6.14-1 +- Update to 0.6.14 + * Sat Jan 21 2023 Fedora Release Engineering - 0.6.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild