diff --git a/.gitignore b/.gitignore index 4ac7aac..8b299a4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /sratom-0.6.2.tar.bz2 /sratom-0.6.4.tar.bz2 /sratom-0.6.6.tar.bz2 +/sratom-0.6.8.tar.bz2 diff --git a/sources b/sources index 7b5ce19..a8f7df8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sratom-0.6.6.tar.bz2) = ccc209af68a39c1a669ba694d250b292df2f588aeea2a9d1dfe54a23e31f032fcce1d99ebf9dd7cff80ce5aedd204c74e3ccc04d6cd239921cd3e443db83ed55 +SHA512 (sratom-0.6.8.tar.bz2) = 49ec4b230a72005ab7a7a3de0bfa630a27a16f9f811ca8e7f6da7fcf6b34526577217075d428a993f95b813dd2a82a9b6892eeb2e36b66b122ada778fbb3fb95 diff --git a/sratom-doc-install-directory.patch b/sratom-doc-install-directory.patch new file mode 100644 index 0000000..c91c9bf --- /dev/null +++ b/sratom-doc-install-directory.patch @@ -0,0 +1,12 @@ +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-remove-deprecated-doxygen.patch b/sratom-remove-deprecated-doxygen.patch deleted file mode 100644 index dec6e3b..0000000 --- a/sratom-remove-deprecated-doxygen.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 85c90e29f7fceae61c70bca141a123807b4b6f14 Mon Sep 17 00:00:00 2001 -From: David Robillard -Date: Sun, 27 Sep 2020 17:19:45 +0200 -Subject: [PATCH] Remove deprecated Doxygen configuration keys - ---- - doc/reference.doxygen.in | 23 +---------------------- - 1 file changed, 1 insertion(+), 22 deletions(-) - -diff --git a/doc/reference.doxygen.in b/doc/reference.doxygen.in -index 1714f60..ab16c97 100644 ---- a/doc/reference.doxygen.in -+++ b/doc/reference.doxygen.in -@@ -243,12 +243,6 @@ TAB_SIZE = 4 - - ALIASES = - --# This tag can be used to specify a number of word-keyword mappings (TCL only). --# A mapping has the form "name=value". For example adding "class=itcl::class" --# will allow you to use the command class in the itcl::class meaning. -- --TCL_SUBST = -- - # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources - # only. Doxygen will then generate output that is more tailored for C. For - # instance, some of the names that are used will be different. The list of all -@@ -1685,7 +1679,7 @@ COMPACT_LATEX = NO - # The default value is: a4. - # This tag requires that the tag GENERATE_LATEX is set to YES. - --PAPER_TYPE = a4wide -+PAPER_TYPE = a4 - - # The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names - # that should be included in the LaTeX output. The package can be specified just -@@ -2157,12 +2151,6 @@ EXTERNAL_GROUPS = YES - - EXTERNAL_PAGES = YES - --# The PERL_PATH should be the absolute path and name of the perl script --# interpreter (i.e. the result of 'which perl'). --# The default file (with absolute path) is: /usr/bin/perl. -- --PERL_PATH = /usr/bin/perl -- - #--------------------------------------------------------------------------- - # Configuration options related to the dot tool - #--------------------------------------------------------------------------- -@@ -2176,15 +2164,6 @@ PERL_PATH = /usr/bin/perl - - CLASS_DIAGRAMS = NO - --# You can define message sequence charts within doxygen comments using the \msc --# command. Doxygen will then run the mscgen tool (see: --# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the --# documentation. The MSCGEN_PATH tag allows you to specify the directory where --# the mscgen tool resides. If left empty the tool is assumed to be found in the --# default search path. -- --MSCGEN_PATH = -- - # You can include diagrams made with dia in doxygen documentation. Doxygen will - # then run dia to produce the diagram and insert it in the documentation. The - # DIA_PATH tag allows you to specify the directory where the dia binary resides. --- -2.25.4 - diff --git a/sratom.spec b/sratom.spec index 8485ba0..b3f4f36 100644 --- a/sratom.spec +++ b/sratom.spec @@ -2,15 +2,14 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: sratom -Version: 0.6.6 -Release: 3%{?dist} +Version: 0.6.8 +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 -# Patch from upstream -Patch0: %{name}-remove-deprecated-doxygen.patch +Patch0: %{name}-doc-install-directory.patch BuildRequires: python3 BuildRequires: doxygen @@ -19,6 +18,8 @@ BuildRequires: sord-devel >= 0.14.0 BuildRequires: serd-devel >= 0.30.0 BuildRequires: lv2-devel >= 1.16.0 BuildRequires: gcc +BuildRequires: python3-sphinx +BuildRequires: python3-sphinx_lv2_theme %description %{name} is a new C library for serializing LV2 atoms to/from Turtle. It is @@ -65,7 +66,7 @@ chmod +x %{buildroot}%{_libdir}/lib%{name}-0.so.* install -pm 644 COPYING NEWS README.md %{buildroot}%{_pkgdocdir} %check -./build/sratom_test +%{python3} waf test -v %files %{_pkgdocdir} @@ -79,9 +80,11 @@ install -pm 644 COPYING NEWS README.md %{buildroot}%{_pkgdocdir} %{_libdir}/lib%{name}-%{maj}.so %{_libdir}/pkgconfig/%{name}-%{maj}.pc %{_includedir}/%{name}-%{maj}/ -%{_mandir}/man3/* %changelog +* Sun Nov 14 2021 Guido Aulisi - 0.6.8-1 +- Update to 0.6.8 + * Fri Jul 23 2021 Fedora Release Engineering - 0.6.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild