From ea5c39be427ecdb57b986c4e013ef8db223deb3bdbfcc456ff5841681ffd0c00 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Mon, 25 Nov 2019 15:22:20 +0000
Subject: [PATCH] Accepting request 750775 from home:dimstar:Factory

- Add psgml-texinfo-6.7.patch: Fix build with texinfo 6.7, which
  defaults to UTF-8 unless differently specified.

OBS-URL: https://build.opensuse.org/request/show/750775
OBS-URL: https://build.opensuse.org/package/show/Publishing/psgml?expand=0&rev=20
---
 psgml-texinfo-6.7.patch |  9 +++++++++
 psgml.changes           |  6 ++++++
 psgml.spec              | 14 ++++++++------
 3 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 psgml-texinfo-6.7.patch

diff --git a/psgml-texinfo-6.7.patch b/psgml-texinfo-6.7.patch
new file mode 100644
index 0000000..a522a16
--- /dev/null
+++ b/psgml-texinfo-6.7.patch
@@ -0,0 +1,9 @@
+diff -ur psgml-1.4.1.orig/psgml.texi psgml-1.4.1/psgml.texi
+--- psgml-1.4.1.orig/psgml.texi	2013-07-27 15:03:45.000000000 +0200
++++ psgml-1.4.1/psgml.texi	2019-11-25 15:57:56.928114579 +0100
+@@ -1,4 +1,5 @@
+ \input texinfo   @c -*-texinfo-*-
++@documentencoding ISO-8859-1
+ @c %**start of header
+ @setfilename psgml.info
+ @settitle psgml
diff --git a/psgml.changes b/psgml.changes
index d2b13aa..98705ea 100644
--- a/psgml.changes
+++ b/psgml.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov 25 14:59:06 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add psgml-texinfo-6.7.patch: Fix build with texinfo 6.7, which
+  defaults to UTF-8 unless differently specified.
+
 -------------------------------------------------------------------
 Mon Jul 23 13:20:56 UTC 2018 - ke@suse.com
 
diff --git a/psgml.spec b/psgml.spec
index 45c6f59..fc8bd02 100644
--- a/psgml.spec
+++ b/psgml.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package psgml
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -25,7 +25,7 @@ BuildRequires:  unzip
 %define tdtd tdtd.zip
 Requires:       emacs_program
 Summary:        Emacs Add-On to edit SGML/XML documents
-License:        GPL-2.0+ and SUSE-Public-Domain
+License:        GPL-2.0-or-later AND SUSE-Public-Domain
 Group:          Productivity/Editors/Emacs
 Version:        1.4.1
 Release:        0
@@ -47,9 +47,10 @@ Patch5:         psgml-xxml-namespace-face.diff
 Patch6:         tdtd-dtd-patch
 Patch7:         xxml-indentation.diff
 Patch8:         flavour.patch
+Patch9:         psgml-texinfo-6.7.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
-Url:            http://sourceforge.net/projects/psgml/
+URL:            http://sourceforge.net/projects/psgml/
 PreReq:         %install_info_prereq
 
 %description
@@ -77,6 +78,7 @@ Authors:
 %prep
 %setup -q
 %patch -p1
+%patch9 -p1
 cp -p %{SOURCE1} .
 # xxml
 mkdir xxml
@@ -154,7 +156,7 @@ ln -f dot_emacs tdtd.dot.emacs
 %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
 %install_info --info-dir=%{_infodir} %{_infodir}/psgml-api.info.gz
 
-%postun
+%preun
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/psgml-api.info.gz
 
@@ -168,7 +170,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc suse-start-psgml.el
 %doc psgml-jade
 %doc tdtd-readme.txt tdtd-tutorial.txt tdtd.dot.emacs
-# %config %%{_prefix}/share/emacs/site-lisp/suse-start-psgml.el
+# %%config %%{_prefix}/share/emacs/site-lisp/suse-start-psgml.el
 %{_prefix}/share/emacs/site-lisp/psgml
 %doc %{_infodir}/psgml-api.info*
 %doc %{_infodir}/psgml.info*