!2 openEuler-libpsl

Merge pull request !2 from Liquor/master

0001-docs-don-t-include-the-type-hierarchy.patch

@@ -0,0 +1,33 @@
+From eb28dc2d73fc3187fc7d10c3472bd577e4b39c04 Mon Sep 17 00:00:00 2001
+From: openEuler BUildteam <buildteam@openeuler.org>
+Date: Mon, 22 Jun 2020 19:03:29 +0800
+Subject: [PATCH] docs:don't include the type hierarchy
+
+gtk-doc can't generate a type hierarchy when scanning libpsl,
+and gtk-doc 1.30 onwards doesn't write a file if there is no type
+hierarchy (unlike previous releases, which wrote an empty file). 
+This results in the build failing with gtk-doc 1.30 onwards,
+so remove the type hierarchy section from the documentation 
+as it doesn't serve any purpose.
+---
+ docs/libpsl/libpsl-docs.sgml | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/docs/libpsl/libpsl-docs.sgml b/docs/libpsl/libpsl-docs.sgml
+index 1eca9a2..1c38dbc 100644
+--- a/docs/libpsl/libpsl-docs.sgml
++++ b/docs/libpsl/libpsl-docs.sgml
+@@ -22,10 +22,6 @@
+         </para>
+         <xi:include href="xml/libpsl.xml"/>
+   </chapter>
+-  <chapter id="object-tree">
+-    <title>Object Hierarchy</title>
+-     <xi:include href="xml/tree_index.sgml"/>
+-  </chapter>
+   <index id="api-index-full">
+     <title>API Index</title>
+     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
+-- 
+1.8.3.1
+

libpsl.spec

@@ -1,11 +1,13 @@
 Name:		libpsl
 Version:	0.20.2
-Release:        9
+Release:        10
 Summary:	C library to handle the Public Suffix List
 License:	MIT
 URL:		https://rockdaboot.github.io/libpsl
 Source0:	https://github.com/rockdaboot/libpsl/releases/download/libpsl-%{version}/libpsl-%{version}.tar.gz
 
+Patch0000:	0001-docs-don-t-include-the-type-hierarchy.patch
+
 BuildRequires:	gcc git gdb gtk-doc glib2-devel libxslt python3-devel
 BuildRequires:	libicu-devel libidn2-devel publicsuffix-list libunistring-devel 
 Requires:	publicsuffix-list
@@ -97,6 +99,12 @@ make check
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Jun 22 2020 Liquor <lirui130@huawei.com> - 0.20.2-10
+- Type: bugfix
+- ID: NA
+- SUG: NA
+- DESC: docs: don't include the type hierarchy 
+
 * Wed Oct 10 2019 luhuaxin <luhuaxin@huawei.com> - 0.20.2-9
 - Type: enhancement
 - ID: NA