Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

.gitignore

@@ -1,3 +1,5 @@
 /xsd-3.3.0+dep.tar.bz2
 /xsd-3.3.0-1+dep.tar.bz2
 /xsd-3.3.0-2+dep.tar.bz2
+/xsd-4.0.0+dep.tar.bz2
+/xsd-4.1.0.a11+dep.tar.bz2

sources

@@ -1 +1 @@
-7ecee5029c119ef678bbe5ca4ef8a288  xsd-3.3.0-2+dep.tar.bz2
+SHA512 (xsd-4.1.0.a11+dep.tar.bz2) = aee71228511f4eb33132389e91cd15f974ce2384bb1658e61ff502320d5a0c26ce092d2a296facb817906be712c9f661df6baccc4a4f1c25b9b36238c7290f59

xsd-3.3.0-xsdcxx-rename.patch

@@ -1,128 +0,0 @@
-diff -up xsd/documentation/xsd.1.rename xsd/documentation/xsd.1
---- xsd/documentation/xsd.1.rename	2010-06-20 15:45:31.000000000 +0300
-+++ xsd/documentation/xsd.1	2010-06-20 15:46:24.000000000 +0300
-@@ -1,16 +1,16 @@
- .\" Process this file with
--.\" groff -man -Tascii xsd.1
-+.\" groff -man -Tascii xsdcxx.1
- .\"
- .TH XSD 1 "April 2010" "XSD 3.3.0"
- .SH NAME
--xsd \- W3C XML Schema to C++ Compiler
-+xsdcxx \- W3C XML Schema to C++ Compiler
- .\"
- .\"
- .\"
- .\"--------------------------------------------------------------------
- .SH SYNOPSIS
- .\"--------------------------------------------------------------------
--.B xsd
-+.B xsdcxx
- .I command
- .B [
- .I options
-@@ -20,19 +20,19 @@ xsd \- W3C XML Schema to C++ Compiler
- .I file
- .B ...]
- .in
--.B xsd help
-+.B xsdcxx help
- .B [
- .I command
- .B ]
- .in
--.B xsd version
-+.B xsdcxx version
- .\"
- .\"
- .\"
- .\"--------------------------------------------------------------------
- .SH DESCRIPTION
- .\"--------------------------------------------------------------------
--.B xsd
-+.B xsdcxx
- generates vocabulary-specific, statically-typed C++ mapping from W3C XML
- Schema definitions. Particular mapping to produce is selected by a
- .IR command .
-@@ -96,7 +96,7 @@ Print usage information and exit. Use
- .PP
- .RS
- .RS 3
--.B xsd help
-+.B xsdcxx help
- .I command
- .RE
- .PP
-@@ -203,7 +203,7 @@ For example, if you have file
- with namespace
- .B http://example.com/hello
- and you run
--.B xsd
-+.B xsdcxx
- on this file, then the string in question will be:
- 
- .B hello.xsd. http://example.com/hello
-@@ -1877,7 +1877,7 @@ option. With this approach you don't nee
- .\"
- .SH DIAGNOSTICS
- If the input file is not a valid W3C XML Schema definition,
--.B xsd
-+.B xsdcxx
- will issue diagnostic messages to
- .B STDERR
- and exit with non-zero exit code.
-diff -up xsd/documentation/xsd.xhtml.rename xsd/documentation/xsd.xhtml
---- xsd/documentation/xsd.xhtml.rename	2010-06-20 15:47:29.000000000 +0300
-+++ xsd/documentation/xsd.xhtml	2010-06-20 15:47:30.000000000 +0300
-@@ -50,19 +50,19 @@
- 
-   <h1>NAME</h1>
- 
--  <p>xsd - W3C XML Schema to C++ Compiler</p>
-+  <p>xsdcxx - W3C XML Schema to C++ Compiler</p>
- 
-   <h1>SYNOPSIS</h1>
- 
-   <dl id="synopsis">
--    <dt><code><b>xsd</b> <i>command</i> [<i>options</i>] <i>file</i> [<i>file</i> ...]</code></dt>
--    <dt><code><b>xsd help</b> [<i>command</i>]</code></dt>
--    <dt><code><b>xsd version</b></code></dt>
-+    <dt><code><b>xsdcxx</b> <i>command</i> [<i>options</i>] <i>file</i> [<i>file</i> ...]</code></dt>
-+    <dt><code><b>xsdcxx help</b> [<i>command</i>]</code></dt>
-+    <dt><code><b>xsdcxx version</b></code></dt>
-   </dl>
- 
-   <h1>DESCRIPTION</h1>
- 
--  <p><code><b>xsd</b></code> generates vocabulary-specific, statically-typed
-+  <p><code><b>xsdcxx</b></code> generates vocabulary-specific, statically-typed
-   C++ mapping from W3C XML Schema definitions. Particular mapping to
-   produce is selected by a <code><i>command</i></code>. Each mapping has
-   a number of mapping-specific <code><i>options</i></code> that should
-@@ -104,7 +104,7 @@
- 
-     <dt><code><b>help</b></code></dt>
-     <dd>Print usage information and exit. Use
--      <p><code><b>xsd help</b> <i>command</i></code></p>
-+      <p><code><b>xsdcxx help</b> <i>command</i></code></p>
-       for command-specific help.
-     </dd>
- 
-@@ -174,7 +174,7 @@
- 
-       <p>For example, if you have file <code><b>hello.xsd</b></code>
-         with namespace <code><b>http://example.com/hello</b></code> and you run
--        <code><b>xsd</b></code> on this file, then the string in question
-+        <code><b>xsdcxx</b></code> on this file, then the string in question
-         will be:</p>
- 
-       <p><code><b>hello.xsd. http://example.com/hello</b></code></p>
-@@ -1575,7 +1575,7 @@ namespace .*
-   <h1>DIAGNOSTICS</h1>
- 
-   <p>If the input file is not a valid W3C XML Schema definition,
--    <code><b>xsd</b></code> will issue diagnostic messages to STDERR
-+    <code><b>xsdcxx</b></code> will issue diagnostic messages to STDERR
-     and exit with non-zero exit code.</p>
- 
-   <h1>BUGS</h1>

xsd-4.1.0-xsdcxx-rename.patch

@@ -0,0 +1,160 @@
+Description: change docu from xsd to xsdcxx
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Reviewed-by: 
+Last-Update: 2014-07-22
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: xsd/doc/xsd.1
+===================================================================
+--- xsd/doc/xsd.1	2014-07-21 08:38:41.000000000 +0200
++++ xsd/doc/xsd.1	2014-07-21 23:27:00.928980158 +0200
+@@ -1,16 +1,16 @@
+ .\" Process this file with
+ .\" groff -man -Tascii xsd.1
+ .\"
+-.TH XSD 1 "July 2014" "XSD 4.1.0"
++.TH XSDCXX 1 "July 2014" "XSDCXX 4.1.0"
+ .SH NAME
+-xsd \- W3C XML Schema to C++ Compiler
++xsdcxx \- W3C XML Schema to C++ Compiler
+ .\"
+ .\"
+ .\"
+ .\"--------------------------------------------------------------------
+ .SH SYNOPSIS
+ .\"--------------------------------------------------------------------
+-.B xsd
++.B xsdcxx
+ .I command
+ .B [
+ .I options
+@@ -20,19 +20,19 @@
+ .I file
+ .B ...]
+ .in
+-.B xsd help
++.B xsdcxx help
+ .B [
+ .I command
+ .B ]
+ .in
+-.B xsd version
++.B xsdcxx version
+ .\"
+ .\"
+ .\"
+ .\"--------------------------------------------------------------------
+ .SH DESCRIPTION
+ .\"--------------------------------------------------------------------
+-.B xsd
++.B xsdcxx
+ generates vocabulary-specific, statically-typed C++ mapping from W3C XML
+ Schema definitions. Particular mapping to produce is selected by a
+ .IR command .
+@@ -96,7 +96,7 @@
+ .PP
+ .RS
+ .RS 3
+-.B xsd help
++.B xsdcxx help
+ .I command
+ .RE
+ .PP
+@@ -127,10 +127,10 @@
+ uses \fBstd::unique_ptr\fR instead of deprecated \fBstd::auto_ptr\fR\.
+ 
+ When the C++11 mode is selected, you normally don't need to perform any extra
+-steps other than enable C++11 in your C++ compiler, if required\. The XSD
++steps other than enable C++11 in your C++ compiler, if required\. The XSDCXX
+ compiler will automatically add the necessary macro defines to the generated
+-header files that will switch the header-only XSD runtime library
+-(\fBlibxsd\fR) to the C++11 mode\. However, if you include any of the XSD
++header files that will switch the header-only XSDCXX runtime library
++(\fBlibxsd\fR) to the C++11 mode\. However, if you include any of the XSDCXX
+ runtime headers directly in your application (normally you just include the
+ generated headers), then you will need to define the \fBXSD_CXX11\fR macro for
+ your entire project\.
+@@ -1461,7 +1461,7 @@
+ .\"
+ .SH DIAGNOSTICS
+ If the input file is not a valid W3C XML Schema definition,
+-.B xsd
++.B xsdcxx
+ will issue diagnostic messages to
+ .B STDERR
+ and exit with non-zero exit code.
+Index: xsd/doc/xsd.xhtml
+===================================================================
+--- xsd/doc/xsd.xhtml	2014-07-21 08:38:41.000000000 +0200
++++ xsd/doc/xsd.xhtml	2014-07-21 23:29:32.796093697 +0200
+@@ -3,11 +3,11 @@
+ <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+ 
+ <head>
+-  <title>XSD 4.1.0 Compiler Command Line Manual</title>
++  <title>XSDCXX 4.1.0 Compiler Command Line Manual</title>
+ 
+   <meta name="copyright" content="&copy; 2005-2017 Code Synthesis Tools CC"/>
+   <meta name="keywords" content="xsd,xml,schema,c++,mapping,data,binding,code,generator,manual,man,page"/>
+-  <meta name="description" content="XSD Compiler Command Line Manual"/>
++  <meta name="description" content="XSDCXX Compiler Command Line Manual"/>
+ 
+   <link rel="stylesheet" type="text/css" href="default.css" />
+ 
+@@ -52,19 +52,19 @@
+ 
+   <h1>NAME</h1>
+ 
+-  <p>xsd - W3C XML Schema to C++ Compiler</p>
++  <p>xsdcxx - W3C XML Schema to C++ Compiler</p>
+ 
+   <h1>SYNOPSIS</h1>
+ 
+   <dl id="synopsis">
+-    <dt><code><b>xsd</b> <i>command</i> [<i>options</i>] <i>file</i> [<i>file</i> ...]</code></dt>
+-    <dt><code><b>xsd help</b> [<i>command</i>]</code></dt>
+-    <dt><code><b>xsd version</b></code></dt>
++    <dt><code><b>xsdcxx</b> <i>command</i> [<i>options</i>] <i>file</i> [<i>file</i> ...]</code></dt>
++    <dt><code><b>xsdcxx help</b> [<i>command</i>]</code></dt>
++    <dt><code><b>xsdcxx version</b></code></dt>
+   </dl>
+ 
+   <h1>DESCRIPTION</h1>
+ 
+-  <p><code><b>xsd</b></code> generates vocabulary-specific, statically-typed
++  <p><code><b>xsdcxx</b></code> generates vocabulary-specific, statically-typed
+   C++ mapping from W3C XML Schema definitions. Particular mapping to
+   produce is selected by a <code><i>command</i></code>. Each mapping has
+   a number of mapping-specific <code><i>options</i></code> that should
+@@ -134,10 +134,10 @@
+ 
+     <p>When the C++11 mode is selected, you normally don't need to perform any
+     extra steps other than enable C++11 in your C++ compiler, if required. The
+-    XSD compiler will automatically add the necessary macro defines to the
+-    generated header files that will switch the header-only XSD runtime
++    XSDCXX compiler will automatically add the necessary macro defines to the
++    generated header files that will switch the header-only XSDCXX runtime
+     library (<code><b>libxsd</b></code>) to the C++11 mode. However, if you
+-    include any of the XSD runtime headers directly in your application
++    include any of the XSDCXX runtime headers directly in your application
+     (normally you just include the generated headers), then you will need to
+     define the <code><b>XSD_CXX11</b></code> macro for your entire
+     project.</p></dd>
+@@ -218,7 +218,7 @@
+ 
+     <p>For example, if you have file <code><b>hello.xsd</b></code> with
+     namespace <code><b>http://example.com/hello</b></code> and you run
+-    <code><b>xsd</b></code> on this file, then the string in question will
++    <code><b>xsdcxx</b></code> on this file, then the string in question will
+     be:</p>
+ 
+     <p><code><b>hello.xsd. http://example.com/hello</b></code></p>
+@@ -1564,7 +1564,7 @@
+   <h1>DIAGNOSTICS</h1>
+ 
+   <p>If the input file is not a valid W3C XML Schema definition,
+-    <code><b>xsd</b></code> will issue diagnostic messages to STDERR
++    <code><b>xsdcxx</b></code> will issue diagnostic messages to STDERR
+     and exit with non-zero exit code.</p>
+ 
+   <h1>BUGS</h1>

xsd-xerces_3-2.patch

@@ -0,0 +1,176 @@
+From 442e98604d4158dae11056c4f94aaa655cb480fa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
+Date: Wed, 8 Nov 2017 20:45:40 +0100
+Subject: New 0110-xerces-c3.2.patch, change maintainer email
+
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: xsd/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx
+===================================================================
+--- xsd/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx
++++ xsd/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx
+@@ -43,7 +43,7 @@ main (int argc, char* argv[])
+       if (s[0] != "abc" ||
+           s[1] != "\xE6" ||
+           s[2] != "\xA2\xA3\xA4\xA5" ||
+-          s[3] != "???")
++          s[3] != "??")
+       {
+         cerr << "invalid encoding" << endl;
+         return 1;
+Index: xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.std
+===================================================================
+--- xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.std
++++ xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.std
+@@ -6 +6 @@
+-  <a>???</a>
++  <a>??</a>
+Index: trunk/xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.xml
+===================================================================
+--- xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.xml
++++ xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.xml
+@@ -5,7 +5,7 @@
+   <a>abc</a>
+   <a>&#xE6;</a>
+   <a>&#xA2;&#xA3;&#xA4;&#xA5;</a>
+-  <a>&#x100;&#xAAAA;&#xAAAAA;</a>
++  <a>&#x100;&#xAAAA;</a>
+ 
+   <b>abc</b>
+   <b>a&#xE2;c</b>
+Index: xsd/tests/cxx/tree/encoding/char/utf-8/driver.cxx
+===================================================================
+--- xsd/tests/cxx/tree/encoding/char/utf-8/driver.cxx
++++ xsd/tests/cxx/tree/encoding/char/utf-8/driver.cxx
+@@ -32,8 +32,7 @@ main (int argc, char* argv[])
+ 
+       if (s[0] != "abc" ||
+           s[1] != "\xD5\x95" ||
+-          s[2] != "\xEA\xAA\xAA" ||
+-          s[3] != "\xF2\xAA\xAA\xAA")
++          s[2] != "\xEA\xAA\xAA")
+       {
+         cerr << "invalid encoding" << endl;
+         return 1;
+@@ -45,8 +44,7 @@ main (int argc, char* argv[])
+ 
+       if (s[0] != strenum::abc ||
+           s[1] != strenum::a_c ||
+-          s[2] != strenum::cxx_bc ||
+-          s[3] != strenum::ab_)
++          s[2] != strenum::cxx_bc)
+       {
+         cerr << "invalid encoding" << endl;
+         return 1;
+Index: xsd/tests/cxx/tree/encoding/char/utf-8/test.std
+===================================================================
+--- xsd/tests/cxx/tree/encoding/char/utf-8/test.std
++++ xsd/tests/cxx/tree/encoding/char/utf-8/test.std
+@@ -3,9 +3,7 @@
+   <a>abc</a>
+   <a>&#x555;</a>
+   <a>&#xAAAA;</a>
+-  <a>&#xAAAAA;</a>
+   <b>abc</b>
+   <b>a&#x555;c</b>
+   <b>&#xAAAA;bc</b>
+-  <b>ab&#xAAAAA;</b>
+ </t:root>
+Index: xsd/tests/cxx/tree/encoding/char/utf-8/test.xml
+===================================================================
+--- xsd/tests/cxx/tree/encoding/char/utf-8/test.xml
++++ xsd/tests/cxx/tree/encoding/char/utf-8/test.xml
+@@ -5,11 +5,9 @@
+   <a>abc</a>
+   <a>&#x555;</a>
+   <a>&#xAAAA;</a>
+-  <a>&#xAAAAA;</a>
+ 
+   <b>abc</b>
+   <b>a&#x555;c</b>
+   <b>&#xAAAA;bc</b>
+-  <b>ab&#xAAAAA;</b>
+ 
+ </t:root>
+Index: xsd/tests/cxx/tree/encoding/char/utf-8/test.xsd
+===================================================================
+--- xsd/tests/cxx/tree/encoding/char/utf-8/test.xsd
++++ xsd/tests/cxx/tree/encoding/char/utf-8/test.xsd
+@@ -9,7 +9,6 @@
+         abc
+         a&#x555;c
+         &#xAAAA;bc
+-        ab&#xAAAAA;
+       </documentation>
+     </annotation>
+ 
+@@ -17,7 +16,6 @@
+       <enumeration value="abc"/>
+       <enumeration value="a&#x555;c"/>
+       <enumeration value="&#xAAAA;bc"/>
+-      <enumeration value="ab&#xAAAAA;"/>
+     </restriction>
+   </simpleType>
+ 
+Index: xsd/tests/cxx/tree/encoding/wchar/test.std
+===================================================================
+--- xsd/tests/cxx/tree/encoding/wchar/test.std
++++ xsd/tests/cxx/tree/encoding/wchar/test.std
+@@ -2,9 +2,9 @@
+ <t:root xmlns:t="test">
+   <a>abc</a>
+   <a>&#x1FFF;&#xD7FF;</a>
+-  <a>&#x10000;&#x10FFFD;</a>
++  <a>&#x1000;&#x10FF;</a>
+   <b>abc</b>
+   <b>a&#x1FFF;&#xD7FF;c</b>
+-  <b>&#x10000;&#x10FFFD;bc</b>
+-  <b>ab&#x10000;&#x10FFFD;</b>
++  <b>&#x1000;&#x10FF;bc</b>
++  <b>ab&#x1000;&#x10FF;</b>
+ </t:root>
+Index: xsd/tests/cxx/tree/encoding/wchar/test.xml
+===================================================================
+--- xsd/tests/cxx/tree/encoding/wchar/test.xml
++++ xsd/tests/cxx/tree/encoding/wchar/test.xml
+@@ -4,11 +4,11 @@
+ 
+   <a>abc</a>
+   <a>&#x1FFF;&#xD7FF;</a>
+-  <a>&#x10000;&#x10FFFD;</a>
++  <a>&#x1000;&#x10FF;</a>
+ 
+   <b>abc</b>
+   <b>a&#x1FFF;&#xD7FF;c</b>
+-  <b>&#x10000;&#x10FFFD;bc</b>
+-  <b>ab&#x10000;&#x10FFFD;</b>
++  <b>&#x1000;&#x10FF;bc</b>
++  <b>ab&#x1000;&#x10FF;</b>
+ 
+ </t:root>
+Index: xsd/tests/cxx/tree/encoding/wchar/test.xsd
+===================================================================
+--- xsd/tests/cxx/tree/encoding/wchar/test.xsd
++++ xsd/tests/cxx/tree/encoding/wchar/test.xsd
+@@ -8,16 +8,16 @@
+         Test enum. Valid values are:
+         abc
+         a&#x1FFF;&#xD7FF;c
+-        &#x10000;&#x10FFFD;bc
+-        ab&#x10000;&#x10FFFD;
++        &#x1000;&#x10FF;bc
++        ab&#x1000;&#x10FF;
+       </documentation>
+     </annotation>
+ 
+     <restriction base="string">
+       <enumeration value="abc"/>
+       <enumeration value="a&#x1FFF;&#xD7FF;c"/>
+-      <enumeration value="&#x10000;&#x10FFFD;bc"/>
+-      <enumeration value="ab&#x10000;&#x10FFFD;"/>
++      <enumeration value="&#x1000;&#x10FF;bc"/>
++      <enumeration value="ab&#x1000;&#x10FF;"/>
+     </restriction>
+   </simpleType>
+ 
+
+

xsd.spec

@@ -1,24 +1,30 @@
-Name:           xsd
-Version:        3.3.0
-Release:        17%{?dist}
-Summary:        W3C XML schema to C++ data binding compiler
-
-Group:          Development/Tools
+Name: xsd
+Version: 4.1.0
+Release: 0.20.a11%{?dist}
+Summary: W3C XML schema to C++ data binding compiler
 # Exceptions permit otherwise GPLv2 incompatible combination with ASL 2.0
-License:        GPLv2 with exceptions and ASL 2.0  
-URL:            http://www.codesynthesis.com/products/xsd/
-Source0:        http://www.codesynthesis.com/download/xsd/3.3/xsd-%{version}-2+dep.tar.bz2
-# Sent suggestion to upstream via e-mail 20090707
-Patch0:         xsd-3.3.0-xsdcxx-rename.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Automatically converted from old format: GPLv2 with exceptions and ASL 2.0 - review is highly recommended.
+License: LicenseRef-Callaway-GPLv2-with-exceptions AND Apache-2.0  
+URL: https://www.codesynthesis.com/products/xsd/
+Source0: https://codesynthesis.com/~boris/tmp/xsd/%{version}.a11/xsd-%{version}.a11+dep.tar.bz2
 
-BuildRequires:  m4 boost-devel xerces-c-devel
-# Requires:  ace-devel - only needed for applications using
-#                        Adaptive Communication Environment (ACE) streams,
-#                        enable when Fedora gets ACE packages.
-#                        See http://www.cs.wustl.edu/~schmidt/ACE.html and
-#                        https://bugzilla.redhat.com/show_bug.cgi?id=450164
-Requires:       xerces-c-devel
+# Sent suggestion to upstream via e-mail 20090707
+# http://anonscm.debian.org/cgit/collab-maint/xsd.git/tree/debian/patches/0001-xsd_xsdcxx-rename.patch
+Patch0: %{name}-%{version}-xsdcxx-rename.patch
+
+# Remove tests for character reference values unsupported by Xerces-C++ 3.2
+# https://anonscm.debian.org/cgit/collab-maint/xsd.git/diff/debian/patches/0110-xerces-c3.2.patch?id=442e98604d4158dae11056c4f94aaa655cb480fa
+Patch1: %{name}-xerces_3-2.patch
+
+BuildRequires: make
+BuildRequires: m4, xerces-c-devel, libcutl-devel, gcc-c++
+
+%if 0%{?rhel} >= 8 || 0%{?fedora}
+BuildRequires: boost-devel
+%else
+BuildRequires: boost148-devel
+Requires: boost148%{?_isa}
+%endif
 
 %description
 CodeSynthesis XSD is an open-source, cross-platform W3C XML Schema to
@@ -29,51 +35,31 @@ You can then access the data stored in XML using types and functions
 that semantically correspond to your application domain rather than
 dealing with intricacies of reading and writing XML.
 
-
-%package        doc
-Group:          Documentation
-Summary:        API documentation files for %{name}
+%package   doc
+BuildArch: noarch
+BuildRequires: ghostscript
+Summary:   API documentation files for %{name}
 
 %description    doc
 This package contains API documentation for %{name}.
 
-
 %prep
-%setup -q -n xsd-%{version}-2+dep
-pushd xsd
-%patch0 -p1 -b .xsdcxx-rename
-popd
+%autosetup -p0 -n xsd-%{version}.a11+dep
 
+##Unbundle libcutl
+rm -rf libcutl
 
 %build
-
-# Default GCC on EL-5 will fail on this code with internal
-# compiler error when debugging symbol generation is requested with -g
-# Reducing debug level to 1 will "fix" this problem. A better way would
-# be to use gcc-44, but old versions of boost headers do not compile 
-# with it (https://svn.boost.org/trac/boost/ticket/2069).
-# Also boost-1.33.1 on those systems does not have boost_system library
-# thus we need to disable explicit linking against it.
-
-%if 0%{?el5}
-make verbose=1 CXXFLAGS="$RPM_OPT_FLAGS -g1" BOOST_LINK_SYSTEM=n
-%else
-make verbose=1 CXXFLAGS="$RPM_OPT_FLAGS"
-%endif
-
+%make_build verbose=1 CXX=g++ CC=gcc CXXFLAGS="$RPM_OPT_FLAGS -std=c++14 -fPIC -pie -Wl,-z,now" LDFLAGS="%{__global_ldflags} -fPIC -pie -Wl,-z,now" BOOST_LINK_SYSTEM=y EXTERNAL_LIBCUTL=y
 
 %install
-rm -rf $RPM_BUILD_ROOT
 rm -rf apidocdir
 
-%if 0%{?el5}
-make install_prefix="$RPM_BUILD_ROOT%{_prefix}" BOOST_LINK_SYSTEM=n install
-%else
-make install_prefix="$RPM_BUILD_ROOT%{_prefix}" install
-%endif
+%make_install LDFLAGS="%{__global_ldflags}" install_prefix=$RPM_BUILD_ROOT%{_prefix} \
+ install_bin_dir=$RPM_BUILD_ROOT%{_bindir} install_man_dir=$RPM_BUILD_ROOT%{_mandir} EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
 
 # Split API documentation to -doc subpackage.
-mkdir apidocdir
+mkdir -p apidocdir
 mv $RPM_BUILD_ROOT%{_datadir}/doc/xsd/*.{xhtml,css} apidocdir/
 mv $RPM_BUILD_ROOT%{_datadir}/doc/xsd/cxx/ apidocdir/
 mv $RPM_BUILD_ROOT%{_datadir}/doc/xsd/ docdir/
@@ -106,23 +92,190 @@ find apidocdir -name "*.doxygen" \
             -o -name "makefile" \
             -o -name "*.html2ps" | xargs rm -f
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+##Test failed on EPEL6 due to "bad" xerces-c
+##http://codesynthesis.com/pipermail/xsd-users/2015-October/004696.html
+##https://bugzilla.redhat.com/show_bug.cgi?id=1270978
+%if 0%{?fedora} || 0%{?rhel} >= 7
+%check
+make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
+%endif
 
 %files
-%defattr(-,root,root,-)
-%doc docdir/*
+%doc docdir/README docdir/NEWS docdir/FLOSSE
+%license docdir/GPLv2 docdir/LICENSE
 %{_bindir}/xsdcxx
-%{_includedir}/xsd/
 %{_mandir}/man1/xsdcxx.1*
+%{_includedir}/xsd/
 
 %files doc
-%defattr(-,root,root,-)
+%doc docdir/README docdir/NEWS docdir/FLOSSE
+%license docdir/GPLv2 docdir/LICENSE
 %doc apidocdir/*
 
-
 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.20.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.19.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.18.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.17.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Fri Oct 18 2024 Pete Walter <pwalter@fedoraproject.org> - 4.1.0-0.16.a11
+- Rebuild for xerces-c 3.3
+
+* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 4.1.0-0.15.a11
+- convert license to SPDX
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.14.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.13.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.12.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.11.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.10.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.9.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jan 07 2022 Antonio Trande <sagitter@fedoraproject.org> - 4.1.0-0.8.a11
+- Rebuild for EPEL9
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.7.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.6.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Jeff Law <law@redhat.com> - 4.1.0-0.5.a11
+- Force C++14 as this code is not C++17 ready
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.4.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.3.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-0.2.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 15 2019 Antonio Trande <sagitter@fedoraproject.org> - 4.1.0-0.1.a11
+- Pre-release 4.1.0.a11
+
+* Thu Feb 07 2019 Antonio Trande <sagitter@fedoraproject.org> - 4.0.0-27
+- Fix BR required for rhel8
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Nov 03 2018 Antonio Trande <sagitter@fedoraproject.org> - 4.0.0-25
+- Some minor changes
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Feb 22 2018 Antonio Trande <sagitter@fedoraproject.org> - 4.0.0-23
+- Add gcc-c++ BR
+
+* Fri Feb 16 2018 Antonio Trande <sagitterATfedoraproject.org> - 4.0.0-22
+- Patched for xerces-c-3.2 (patch from Debian)
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Jul 18 2017 Jonathan Wakely <jwakely@redhat.com> - 4.0.0-18
+- Rebuilt for Boost 1.64
+
+* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.0-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sun Jun 26 2016 Antonio Trande <sagitterATfedoraproject.org> - 4.0.0-15
+- Remove conditional macro for the Patch1 (bz#1350231)
+
+* Fri Feb 05 2016 Antonio Trande <sagitterATfedoraproject.org> - 4.0.0-14
+- Set flags for hardened builds
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Jan 18 2016 Jonathan Wakely <jwakely@redhat.com> - 4.0.0-12
+- Rebuilt for Boost 1.60
+
+* Wed Nov 25 2015 Antonio Trande <sagitterATfedoraproject.org> - 4.0.0-11
+- Rebuild for libcutl
+
+* Fri Nov 06 2015 Antonio Trande <sagitterATfedoraproject.org> - 4.0.0-10
+- Add patch to fix bug in C++/Parser Expat Support in EPEL builds
+
+* Mon Oct 12 2015 Antonio Trande <sagitterATfedoraproject.org> - 4.0.0-9
+- Header files included again in main package
+
+* Mon Oct 12 2015 Antonio Trande <sagitterATfedoraproject.org> - 4.0.0-8
+- Requires explicitely Boost148 in EPEL
+- Tests not performed in EPEL6
+
+* Thu Oct 08 2015 Antonio Trande <sagitterATfedoraproject.org> - 4.0.0-7
+- Used %%license tag
+- libcutl libraries unbundled
+- Header files packaged apart
+- Made tests
+
+* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 4.0.0-6
+- Rebuilt for Boost 1.59
+
+* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
+
+* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 4.0.0-4
+- rebuild for Boost 1.58
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 4.0.0-2
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Sat Mar 28 2015 Kalev Lember <kalevlember@gmail.com> - 4.0.0-1
+- Update to 4.0.0
+
+* Wed Feb 25 2015 Rex Dieter <rdieter@fedoraproject.org> 3.3.0-23
+- rebuild (gcc5)
+
+* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 3.3.0-22
+- Rebuild for boost 1.57.0
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.0-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.0-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu Jun  5 2014 Peter Robinson <pbrobinson@fedoraproject.org> 3.3.0-19
+- Update config.* to fix FTBFS on aarch64/ppc64le
+
+* Thu May 22 2014 Petr Machata <pmachata@redhat.com> - 3.3.0-18
+- Rebuild for boost 1.55.0
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.0-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -192,7 +345,7 @@ rm -rf $RPM_BUILD_ROOT
 - Added verbose=1 to MAKEFLAGS so compiler flags could be
   verified from build logs.
 
-* Mon Jul 04 2009 Antti Andreimann <Antti.Andreimann@mail.ee> 3.2.0-2
+* Sat Jul 04 2009 Antti Andreimann <Antti.Andreimann@mail.ee> 3.2.0-2
 - Changed License tag to clarify which exceptions we are talking about
 
 * Wed May 20 2009 Antti Andreimann <Antti.Andreimann@mail.ee> 3.2.0-1