[packages/shared-mime-info] fix build with doc; rel 2

atler atler at pld-linux.org
Mon Oct 9 14:59:52 CEST 2023


commit dabbd0362fbd2a2345f450a5efceb62eb321741b
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Oct 9 14:11:26 2023 +0200

    fix build with doc; rel 2
    
    replace unicode apostrophe with ascii one. from:
    https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/254

 shared-mime-info.spec |  4 +++-
 spec-apostrophe.patch | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index 9d2d50a..94f9000 100644
--- a/shared-mime-info.spec
+++ b/shared-mime-info.spec
@@ -10,12 +10,13 @@ Summary:	Shared MIME-info specification
 Summary(pl.UTF-8):	Wspólna specyfikacja MIME-info
 Name:		shared-mime-info
 Version:	2.3
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL
 Group:		Applications/Databases
 Source0:	https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/%{version}/%{name}-%{version}.tar.bz2
 # Source0-md5:	a6c4b35bc36c3764d18e2472dc9c8484
+Patch0:		spec-apostrophe.patch
 URL:		https://www.freedesktop.org/wiki/Software/shared-mime-info
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	docbook-utils
@@ -96,6 +97,7 @@ informacji MIME).
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %meson build \
diff --git a/spec-apostrophe.patch b/spec-apostrophe.patch
new file mode 100644
index 0000000..def6a4c
--- /dev/null
+++ b/spec-apostrophe.patch
@@ -0,0 +1,25 @@
+From 84169377477fcf2dda08e624a12be727c95aacc9 Mon Sep 17 00:00:00 2001
+From: Jan Palus <jpalus at fastmail.com>
+Date: Mon, 9 Oct 2023 14:00:03 +0200
+Subject: [PATCH] spec: use regular ascii apostrophe char instead of U+2019
+
+---
+ data/shared-mime-info-spec.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/shared-mime-info-spec.xml b/data/shared-mime-info-spec.xml
+index 9ba1cfc..3054fac 100644
+--- a/data/shared-mime-info-spec.xml
++++ b/data/shared-mime-info-spec.xml
+@@ -359,7 +359,7 @@ If <userinput>localName</userinput> is present but empty then the document eleme
+ any name, but the namespace must still match.
+ 				</para><para>
+ If <userinput>namespaceURI</userinput> is present but empty then the match is done entirely on
+-the document element’s local name and any namespace URI present in the document is ignored.
++the document element's local name and any namespace URI present in the document is ignored.
+ 				</para><para>
+ Both attributes must be specified, and at least one of them must be non-empty.
+ 				</para></listitem>
+-- 
+2.42.0
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/shared-mime-info.git/commitdiff/dabbd0362fbd2a2345f450a5efceb62eb321741b



More information about the pld-cvs-commit mailing list