From e0d72c649ba23d533080ec10c52e514dc773d260a81632e8e1406d9d7acbb813 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 1 May 2023 07:08:08 +0000 Subject: [PATCH 1/2] Accepting request 1083646 from home:kill_it:branches:multimedia:libs - Update to 0.30.16 * Switch to meson * Add html documentation do devel 0.30.16 changes: * Add SERD_STATIC to pkg-config Cflags for static-only builds * Adopt REUSE machine-readable licensing standard * Allow programs to be used from subproject * Fix spelling mistake in serdi man page 0.30.14 changes: * Fix memory consumption when reading documents * Switch to Meson build system * Update README and project metadata OBS-URL: https://build.opensuse.org/request/show/1083646 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/serd?expand=0&rev=33 --- 001-serd-docdir.patch | 11 +++++++++++ serd-0.30.12.tar.bz2 | 3 --- serd-0.30.16.tar.xz | 3 +++ serd.changes | 18 ++++++++++++++++++ serd.spec | 32 ++++++++++---------------------- 5 files changed, 42 insertions(+), 25 deletions(-) create mode 100644 001-serd-docdir.patch delete mode 100644 serd-0.30.12.tar.bz2 create mode 100644 serd-0.30.16.tar.xz diff --git a/001-serd-docdir.patch b/001-serd-docdir.patch new file mode 100644 index 0000000..10775b0 --- /dev/null +++ b/001-serd-docdir.patch @@ -0,0 +1,11 @@ +--- ./doc/meson.build.orig 2022-12-26 22:48:38.800134462 +1000 ++++ doc/meson.build 2022-12-26 22:49:09.232891680 +1000 +@@ -1,7 +1,7 @@ + # Copyright 2020-2022 David Robillard + # SPDX-License-Identifier: 0BSD OR ISC + +-docdir = get_option('datadir') / 'doc' ++docdir = get_option('datadir') / 'doc' / 'packages' + + doxygen = find_program('doxygen', required: get_option('docs')) + dox_to_sphinx = files('../scripts/dox_to_sphinx.py') diff --git a/serd-0.30.12.tar.bz2 b/serd-0.30.12.tar.bz2 deleted file mode 100644 index 4aa1eda..0000000 --- a/serd-0.30.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f9dab4125d88256c1f694b6638cbdbf84c15ce31003cd83cb32fb2192d3e866 -size 594475 diff --git a/serd-0.30.16.tar.xz b/serd-0.30.16.tar.xz new file mode 100644 index 0000000..71cb0d3 --- /dev/null +++ b/serd-0.30.16.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f50f486da519cdd8d03b20c9e42414e459133f5a244411d8e63caef8d9ac9146 +size 173932 diff --git a/serd.changes b/serd.changes index 8358e41..b98f7fc 100644 --- a/serd.changes +++ b/serd.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Dec 26 12:54:01 UTC 2022 - Konstantin Voinov + +- Update to 0.30.16 + * Switch to meson + * Add html documentation do devel + + 0.30.16 changes: + * Add SERD_STATIC to pkg-config Cflags for static-only builds + * Adopt REUSE machine-readable licensing standard + * Allow programs to be used from subproject + * Fix spelling mistake in serdi man page + + 0.30.14 changes: + * Fix memory consumption when reading documents + * Switch to Meson build system + * Update README and project metadata + ------------------------------------------------------------------- Sat Jun 18 14:27:33 UTC 2022 - Dirk Müller diff --git a/serd.spec b/serd.spec index fb9f223..9a81465 100644 --- a/serd.spec +++ b/serd.spec @@ -18,16 +18,19 @@ %define sover 0 Name: serd -Version: 0.30.12 +Version: 0.30.16 Release: 0 Summary: A lightweight C library for RDF syntax License: ISC Group: Development/Libraries/C and C++ URL: https://drobilla.net/software/serd.html -Source0: https://download.drobilla.net/serd-%{version}.tar.bz2 +Source0: https://download.drobilla.net/serd-%{version}.tar.xz Source1: baselibs.conf +Patch0: 001-serd-docdir.patch BuildRequires: doxygen +BuildRequires: fdupes BuildRequires: graphviz +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: python3-Sphinx @@ -60,31 +63,18 @@ Development files for libserd. %prep %setup -q +%autopatch -p0 #Convert all file headers to python3 for i in `grep -rl "%{_bindir}/env python"`;do sed -i '1s/^#!.*/#!\/usr\/bin\/python3/' ${i} ;done %build -export CFLAGS='%{optflags} -std=gnu99' -export CXXFLAGS='%{optflags}' -./waf configure \ - --prefix=%{_prefix} \ - --libdir=%{_libdir} \ -%if 0%{?suse_version} > 1501 - --test \ - --docs \ -%endif - --docdir=%{_defaultdocdir} \ - -./waf build -v %{?_smp_mflags} +%meson +%meson_build %install -./waf install --destdir=%{?buildroot} -rm -rf %{buildroot}%{_docdir}/serd-0/html +%meson_install -%if 0%{?suse_version} > 1501 -%check -./waf test -%endif +%fdupes -s %{buildroot}%{_docdir} %post -n libserd-0-%{sover} -p /sbin/ldconfig %postun -n libserd-0-%{sover} -p /sbin/ldconfig @@ -99,9 +89,7 @@ rm -rf %{buildroot}%{_docdir}/serd-0/html %{_libdir}/libserd-0.so.%{sover}* %files devel -%if 0%{?suse_version} > 1501 %doc %{_docdir}/serd-0 -%endif %{_libdir}/libserd-0.so %{_includedir}/serd-0/ %{_libdir}/pkgconfig/serd-0.pc From 0ba6700a78a58dc5d4ddadb2ad680987bf402b249ac69571bfa0f12ddc6fb543 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 2 May 2023 07:44:48 +0000 Subject: [PATCH 2/2] Fix changelog for missing patch OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/serd?expand=0&rev=34 --- serd.changes | 3 +++ serd.spec | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/serd.changes b/serd.changes index b98f7fc..8e40a99 100644 --- a/serd.changes +++ b/serd.changes @@ -16,6 +16,9 @@ Mon Dec 26 12:54:01 UTC 2022 - Konstantin Voinov * Switch to Meson build system * Update README and project metadata +- Installation path fix for documents: + 001-serd-docdir.patch + ------------------------------------------------------------------- Sat Jun 18 14:27:33 UTC 2022 - Dirk Müller diff --git a/serd.spec b/serd.spec index 9a81465..fa9d4cc 100644 --- a/serd.spec +++ b/serd.spec @@ -1,7 +1,7 @@ # # spec file for package serd # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed