From f37ae8a8858baf213b630d829ff6337b5a192a5e Mon Sep 17 00:00:00 2001 From: Guido Aulisi Date: Sun, 5 Feb 2023 12:02:23 +0100 Subject: [PATCH] Update to 0.16.14 Switch to meson build --- .gitignore | 1 + sord.spec | 52 ++++++++++++++++++++++------------------------------ sources | 2 +- 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 7c29342..339cdd5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /sord-0.16.6.tar.bz2 /sord-0.16.8.tar.bz2 /sord-0.16.10.tar.bz2 +/sord-0.16.14.tar.xz diff --git a/sord.spec b/sord.spec index e1dff03..f626b8e 100644 --- a/sord.spec +++ b/sord.spec @@ -1,22 +1,19 @@ %global maj 0 Name: sord -Version: 0.16.10 -Release: 3%{?dist} +Version: 0.16.14 +Release: 1%{?dist} Summary: A lightweight Resource Description Framework (RDF) C library License: ISC -URL: http://drobilla.net/software/sord/ -Source0: http://download.drobilla.net/%{name}-%{version}.tar.bz2 +URL: https://drobilla.net/software/%{name}.html +Source0: https://download.drobilla.net/%{name}-%{version}.tar.xz -BuildRequires: boost-devel BuildRequires: doxygen -BuildRequires: graphviz -BuildRequires: glib2-devel -BuildRequires: python3 -BuildRequires: serd-devel >= 0.30.0 +BuildRequires: serd-devel >= 0.30.10 BuildRequires: gcc -BuildRequires: gcc-c++ +BuildRequires: meson +BuildRequires: pcre-devel %description %{name} is a lightweight C library for storing Resource Description @@ -36,34 +33,26 @@ This package contains the headers and development libraries for %{name}. %prep %autosetup -p1 -# Do not run ldconfig, and add our optflags -sed -i -e "s|bld.add_post_fun(autowaf.run_ldconfig)||" \ - -e "s|cflags = [ '-DSORD_INTERNAL' ]\ -|cflags = [ '-DSORD_INTERNAL' ] + '%optflags'.split(' ') |" wscript %build -%set_build_flags -export LINKFLAGS="%{__global_ldflags}" -%{python3} waf configure \ - --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}-%{maj}.so.* -install -pm 644 AUTHORS NEWS README.md %{buildroot}%{_pkgdocdir} +%meson_install + +# Move devel docs to the right directory +install -d %{buildroot}%{_docdir}/%{name} +mv %{buildroot}%{_docdir}/%{name}-%{maj} %{buildroot}%{_docdir}/%{name} + +%check +%meson_test %files %{_pkgdocdir} %exclude %{_pkgdocdir}/%{name}-%{maj}/ %license COPYING -%{_libdir}/lib%{name}-%{maj}.so.* +%{_libdir}/lib%{name}-%{maj}.so.%{maj}* %{_bindir}/sordi %{_bindir}/sord_validate %{_mandir}/man1/%{name}*.1* @@ -73,9 +62,12 @@ install -pm 644 AUTHORS NEWS README.md %{buildroot}%{_pkgdocdir} %{_libdir}/lib%{name}-%{maj}.so %{_libdir}/pkgconfig/%{name}-%{maj}.pc %{_includedir}/%{name}-%{maj}/ -%{_mandir}/man3/%{name}*.3* %changelog +* Thu Feb 2 2023 Guido Aulisi - 0.16.14-1 +- Update to 0.16.14 +- Switch to meson build + * Sat Jan 21 2023 Fedora Release Engineering - 0.16.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index c143b3a..471b5fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sord-0.16.10.tar.bz2) = 715201eaf4a13a3635337cf8fa7c1a1f229f1d589f70cdf8f67183d90df29cd8b4af180650ce9cd0c651c712d11901bfdc6b51f9b8d7c6e70d8d8f30b1861281 +SHA512 (sord-0.16.14.tar.xz) = f6f254518d5dccece7975529b1fcfd552fd9c37e49dc7e9f8a46756b85e476dac064a39af42bfb3078e999e75d1aa75dcc30ec91e08753defa9363adafdfd3bd