Accepting request 1290763 from utilities

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1290763
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/html-xml-utils?expand=0&rev=13

fix-dtd-declaration.patch

@@ -0,0 +1,12 @@
+--- html-xml-utils-8.7/dtd.c	2025-06-28 10:44:08.062000908 +0200
++++ html-xml-utils-8.7/dtd.c	2025-06-28 10:44:31.310766962 +0200
+@@ -74,8 +74,7 @@
+ } ElementType;
+ 
+ /* lookup_element -- look up the string in the hash table */
+-EXPORT const ElementType * lookup_element(/* register const char *str,
+-					  register unsigned int len */);
++EXPORT const ElementType * lookup_element(register const char *str, register size_t len);
+ 
+ /* Different kinds of parent elements: */
+ #define PHRASE "abbr", "acronym", "b", "bdi", "bdo", "big", "cite", "code", "dfn", "em", "i", "kbd", "q", "s", "samp", "small", "span", "strong", "sub", "sup", "time", "tt", "u", "var"

html-xml-utils-8.6.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5e84729ef36ccd3924d2872ed4ee6954c63332dca5400ba8eb4eaef1f2db4fb2
-size 421530

html-xml-utils-8.7.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:888a31631a7a70308bb2f333e077d0416f4bb78317f8697ffb4a95187f677301
+size 426378

html-xml-utils.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Sat Jun 28 08:46:43 UTC 2025 - Sebastian Wagner <sebix@sebix.at>
+
+- Fix compilation error on tumbleweed with fix-dtd-declaration.patch:
+  dtd.hash:117:1: error: conflicting types for ‘lookup_element’; have ‘const ElementType *(const char *, size_t)’ {aka ‘const struct _ElementType *(const char *, long unsigned int)’}
+    117 | link,           0, 1, 0, 1, 0, 0, 1, 0, {"head", NULL}
+        | ^~~~~~~~~~~~~~~~~~~~~~~
+  dtd.hash:46:28: note: previous declaration of ‘lookup_element’ with type ‘const ElementType *(void)’ {aka ‘const struct _ElementType *(void)’}
+- Add basic check section.
+
+-------------------------------------------------------------------
+Sat Mar  8 15:52:58 UTC 2025 - Andrea Manzini <andrea.manzini@suse.com>
+
+- Update to version 8.7:
+  * textwrap.c: Corrected counting of visible characters on a line
+    (bufchars).
+  * hxcopy.c: Fixed error in an error message.
+
 -------------------------------------------------------------------
 Thu May  4 14:27:28 UTC 2023 - Andrea Manzini <andrea.manzini@suse.com>
 

html-xml-utils.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package html-xml-utils
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,15 @@
 
 
 Name:           html-xml-utils
-Version:        8.6
+Version:        8.7
 Release:        0
 Summary:        A number of utilities for manipulating HTML and XML files
 License:        W3C
 Group:          Development/Languages/Other
 URL:            https://www.w3.org/Tools/HTML-XML-utils/
 Source:         https://www.w3.org/Tools/HTML-XML-utils/html-xml-utils-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM fix-dtd-declaration.patch -- fix compilation error on conflicting declarations
+Patch0:         fix-dtd-declaration.patch
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  libcurl-devel
@@ -34,7 +36,7 @@ HTML-XML-utils provides a number of utilities for manipulating and
 converting HTML and XML files in various ways.
 
 %prep
-%setup -q
+%autosetup -p1
 chmod -x ChangeLog README
 
 %build
@@ -45,10 +47,73 @@ make %{?_smp_mflags}
 %make_install
 rm %{buildroot}%{_datadir}/doc/%{name}/COPYING
 
+%check
+%{buildroot}%{_bindir}/hxextract h1
+
 %files
 %doc ChangeLog README
 %license COPYING
-%{_bindir}/*
-%{_mandir}/man1/*.1*
+%{_bindir}/asc2xml
+%{_bindir}/hxaddid
+%{_bindir}/hxcite
+%{_bindir}/hxcite-mkbib
+%{_bindir}/hxclean
+%{_bindir}/hxcopy
+%{_bindir}/hxcount
+%{_bindir}/hxextract
+%{_bindir}/hxincl
+%{_bindir}/hxindex
+%{_bindir}/hxmkbib
+%{_bindir}/hxmultitoc
+%{_bindir}/hxname2id
+%{_bindir}/hxnormalize
+%{_bindir}/hxnsxml
+%{_bindir}/hxnum
+%{_bindir}/hxpipe
+%{_bindir}/hxprintlinks
+%{_bindir}/hxprune
+%{_bindir}/hxref
+%{_bindir}/hxremove
+%{_bindir}/hxselect
+%{_bindir}/hxtabletrans
+%{_bindir}/hxtoc
+%{_bindir}/hxuncdata
+%{_bindir}/hxunent
+%{_bindir}/hxunpipe
+%{_bindir}/hxunxmlns
+%{_bindir}/hxwls
+%{_bindir}/hxxmlns
+%{_bindir}/xml2asc
+%{_mandir}/man1/asc2xml.1.gz
+%{_mandir}/man1/hxaddid.1.gz
+%{_mandir}/man1/hxcite-mkbib.1.gz
+%{_mandir}/man1/hxcite.1.gz
+%{_mandir}/man1/hxclean.1.gz
+%{_mandir}/man1/hxcopy.1.gz
+%{_mandir}/man1/hxcount.1.gz
+%{_mandir}/man1/hxextract.1.gz
+%{_mandir}/man1/hxincl.1.gz
+%{_mandir}/man1/hxindex.1.gz
+%{_mandir}/man1/hxmkbib.1.gz
+%{_mandir}/man1/hxmultitoc.1.gz
+%{_mandir}/man1/hxname2id.1.gz
+%{_mandir}/man1/hxnormalize.1.gz
+%{_mandir}/man1/hxnsxml.1.gz
+%{_mandir}/man1/hxnum.1.gz
+%{_mandir}/man1/hxpipe.1.gz
+%{_mandir}/man1/hxprintlinks.1.gz
+%{_mandir}/man1/hxprune.1.gz
+%{_mandir}/man1/hxref.1.gz
+%{_mandir}/man1/hxremove.1.gz
+%{_mandir}/man1/hxselect.1.gz
+%{_mandir}/man1/hxtabletrans.1.gz
+%{_mandir}/man1/hxtoc.1.gz
+%{_mandir}/man1/hxuncdata.1.gz
+%{_mandir}/man1/hxunent.1.gz
+%{_mandir}/man1/hxunpipe.1.gz
+%{_mandir}/man1/hxunxmlns.1.gz
+%{_mandir}/man1/hxwls.1.gz
+%{_mandir}/man1/hxxmlns.1.gz
+%{_mandir}/man1/xml2asc.1.gz
 
 %changelog