!4 libpsl update to 0.21.1

Merge pull request !4 from yixiangzhike/master
This commit is contained in:
openeuler-ci-bot 2020-07-27 20:45:00 +08:00 committed by Gitee
commit 98cbafb5b3
3 changed files with 10 additions and 39 deletions

View File

@ -1,33 +0,0 @@
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

View File

@ -1,12 +1,10 @@
Name: libpsl Name: libpsl
Version: 0.20.2 Version: 0.21.1
Release: 10 Release: 1
Summary: C library to handle the Public Suffix List Summary: C library to handle the Public Suffix List
License: MIT License: MIT
URL: https://rockdaboot.github.io/libpsl URL: https://github.com/rockdaboot/libpsl
Source0: https://github.com/rockdaboot/libpsl/releases/download/libpsl-%{version}/libpsl-%{version}.tar.gz Source0: https://github.com/rockdaboot/libpsl/releases/download/%{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: gcc git gdb gtk-doc glib2-devel libxslt python3-devel
BuildRequires: libicu-devel libidn2-devel publicsuffix-list libunistring-devel BuildRequires: libicu-devel libidn2-devel publicsuffix-list libunistring-devel
@ -99,6 +97,12 @@ make check
%{_datadir}/gtk-doc/html/%{name} %{_datadir}/gtk-doc/html/%{name}
%changelog %changelog
* Mon Jul 27 2020 zhangxingliang <zhangxingliang3@huawei.com> - 0.21.1-1
- Type:update
- ID: NA
- SUG: NA
- DESC:update to 0.21.1
* Mon Jun 22 2020 Liquor <lirui130@huawei.com> - 0.20.2-10 * Mon Jun 22 2020 Liquor <lirui130@huawei.com> - 0.20.2-10
- Type: bugfix - Type: bugfix
- ID: NA - ID: NA