The filename for the current translation unit
- is empty. For example, if you have file hello.xsd
+@@ -174,7 +174,7 @@
+
+
For example, if you have file hello.xsd
with namespace http://example.com/hello and you run
- xsd on this file, then the string in question
+ xsdcxx on this file, then the string in question
- would be:
+ will be:
-
http://example.com/hello
-@@ -493,7 +493,7 @@
-
The filename for the current translation unit
- is empty. For example, if you have file hello.xsd
- with namespace http://example.com/hello and you run
-- xsd on this file, then the string in question
-+ xsdcxx on this file, then the string in question
- would be:
-
-
http://example.com/hello element
-@@ -1447,7 +1447,7 @@ namespace .*
+
hello.xsd. http://example.com/hello
+@@ -1575,7 +1575,7 @@ namespace .*
DIAGNOSTICS
If the input file is not a valid W3C XML Schema definition,
diff --git a/xsd.spec b/xsd.spec
index 6e26627..9a8debb 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
-Version: 3.2.0
-Release: 7%{?dist}
+Version: 3.3.0
+Release: 1%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
@@ -8,8 +8,8 @@ Group: Development/Tools
License: GPLv2 with exceptions and ASL 2.0
URL: http://www.codesynthesis.com/products/xsd/
Source0: http://www.codesynthesis.com/download/xsd/3.2/xsd-%{version}+dep.tar.bz2
-Patch0: xsd-3.2.0-xsdcxx-rename.patch
-Patch1: xsd-3.2.0-manfix.patch
+# 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)
BuildRequires: m4 boost-devel xerces-c-devel
@@ -40,21 +40,37 @@ This package contains API documentation for %{name}.
%prep
%setup -q -n xsd-%{version}+dep
-pushd xsd-*
+pushd xsd
%patch0 -p1 -b .xsdcxx-rename
-%patch1 -p1 -b .manfix
popd
%build
-MAKEFLAGS="verbose=1" CXXFLAGS=$RPM_OPT_FLAGS ./build.sh
+
+# 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
%install
rm -rf $RPM_BUILD_ROOT
rm -rf apidocdir
-MAKEFLAGS="install_prefix=$RPM_BUILD_ROOT%{_prefix}" ./build.sh install
+%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
# Split API documentation to -doc subpackage.
mkdir apidocdir
@@ -70,6 +86,8 @@ for file in docdir/NEWS; do
done
# Rename binary to xsdcxx to avoid conflicting with mono-web package.
+# Sent suggestion to upstream via e-mail 20090707
+# they will consider renaming in 4.0.0
mv $RPM_BUILD_ROOT%{_bindir}/xsd $RPM_BUILD_ROOT%{_bindir}/xsdcxx
mv $RPM_BUILD_ROOT%{_mandir}/man1/xsd.1 $RPM_BUILD_ROOT%{_mandir}/man1/xsdcxx.1
@@ -105,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jun 20 2010 Antti Andreimann 3.3.0-1
+- Updated to version 3.3.0
+- Implemented a workaround for gcc segfault on el5
+
* Sun Feb 07 2010 Caolán McNamara - 3.2.0-7
- Rebuild for xerces soname bump
From 876f4b41e93f45dd279b2cf418f12814f9c7f51f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Thu, 29 Jul 2010 16:13:06 +0000
Subject: [PATCH 02/75] dist-git conversion
---
.cvsignore => .gitignore | 0
Makefile | 21 ---------------------
import.log | 2 --
3 files changed, 23 deletions(-)
rename .cvsignore => .gitignore (100%)
delete mode 100644 Makefile
delete mode 100644 import.log
diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 333fa25..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xsd
-# $Id: Makefile,v 1.1 2009/07/07 04:25:09 kevin Exp $
-NAME := xsd
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/import.log b/import.log
deleted file mode 100644
index 8891eb9..0000000
--- a/import.log
+++ /dev/null
@@ -1,2 +0,0 @@
-xsd-3_2_0-3_fc10:HEAD:xsd-3.2.0-3.fc10.src.rpm:1246964574
-xsd-3_3_0-1_fc13:HEAD:xsd-3.3.0-1.fc13.src.rpm:1277041278
From 1f97436559df688a82f636baef884b3bb0b93d8d Mon Sep 17 00:00:00 2001
From: Antti Andreimann
Date: Mon, 2 Aug 2010 18:52:46 +0300
Subject: [PATCH 03/75] Revision bump: rebuild for new boost
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 9a8debb..cb1c7dd 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 3.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Aug 02 2010 Antti Andreimann 3.3.0-2
+- Rebuild for new boost
+
* Sun Jun 20 2010 Antti Andreimann 3.3.0-1
- Updated to version 3.3.0
- Implemented a workaround for gcc segfault on el5
From dc46efce9c41712385a9435d49c5192c07f8b397 Mon Sep 17 00:00:00 2001
From: Thomas Spura
Date: Sun, 6 Feb 2011 15:30:45 +0100
Subject: [PATCH 04/75] rebuild for new boost
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index cb1c7dd..6ab29ce 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 3.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Feb 06 2011 Thomas Spura - 3.3.0-3
+- rebuild for new boost
+
* Mon Aug 02 2010 Antti Andreimann 3.3.0-2
- Rebuild for new boost
From aded2b52d2212ecf24acc3f1f4e242aef3aeeb3c Mon Sep 17 00:00:00 2001
From: Thomas Spura
Date: Sun, 6 Feb 2011 18:50:07 +0100
Subject: [PATCH 05/75] use boost_filesystem version 2
---
xsd.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xsd.spec b/xsd.spec
index 6ab29ce..da7f758 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -58,7 +58,7 @@ popd
%if 0%{?el5}
make verbose=1 CXXFLAGS="$RPM_OPT_FLAGS -g1" BOOST_LINK_SYSTEM=n
%else
-make verbose=1 CXXFLAGS="$RPM_OPT_FLAGS"
+make verbose=1 CXXFLAGS="$RPM_OPT_FLAGS -DBOOST_FILESYSTEM_VERSION=2"
%endif
@@ -124,7 +124,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sun Feb 06 2011 Thomas Spura - 3.3.0-3
-- rebuild for new boost
+- rebuild for new boost (thanks Petr Machata for the fix)
* Mon Aug 02 2010 Antti Andreimann 3.3.0-2
- Rebuild for new boost
From e694fc62851db9b4e580742c919ba6325a09e5f1 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore
Date: Tue, 8 Feb 2011 00:57:50 -0600
Subject: [PATCH 06/75] - Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index da7f758..49fe719 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 3.3.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Feb 08 2011 Fedora Release Engineering - 3.3.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Sun Feb 06 2011 Thomas Spura - 3.3.0-3
- rebuild for new boost (thanks Petr Machata for the fix)
From f9e2432f2b1cfe2a5fa65a2408b776b04d29e2a5 Mon Sep 17 00:00:00 2001
From: Kalev Lember
Date: Thu, 10 Mar 2011 13:16:37 +0200
Subject: [PATCH 07/75] Rebuilt with xerces-c 3.1
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 49fe719..da216e2 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 3.3.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Mar 10 2011 Kalev Lember - 3.3.0-5
+- Rebuilt with xerces-c 3.1
+
* Tue Feb 08 2011 Fedora Release Engineering - 3.3.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
From 7d52fd1d6e42bfe9dbd96c792490e5a78b408f1a Mon Sep 17 00:00:00 2001
From: Kalev Lember
Date: Wed, 6 Apr 2011 19:41:51 +0300
Subject: [PATCH 08/75] Rebuilt for boost 1.46.1 soname bump
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index da216e2..bca432c 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 3.3.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Apr 06 2011 Kalev Lember - 3.3.0-6
+- Rebuilt for boost 1.46.1 soname bump
+
* Thu Mar 10 2011 Kalev Lember - 3.3.0-5
- Rebuilt with xerces-c 3.1
From 27c9672c0508a8fd58affeefd04bf4b62dd23db6 Mon Sep 17 00:00:00 2001
From: Antti Andreimann
Date: Fri, 22 Jul 2011 17:21:12 +0300
Subject: [PATCH 09/75] Rebuilt for boost 1.47.0
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index bca432c..9eb8b08 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 3.3.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jul 22 2011 Antti Andreimann - 3.3.0-7
+- Rebuilt for boost 1.47.0
+
* Wed Apr 06 2011 Kalev Lember - 3.3.0-6
- Rebuilt for boost 1.46.1 soname bump
From 4a9895f9368d0c0b040617fb8743fcf0ee5be7e8 Mon Sep 17 00:00:00 2001
From: Thomas Spura
Date: Sat, 26 Nov 2011 15:45:10 +0100
Subject: [PATCH 10/75] rebuild for
https://fedoraproject.org/wiki/Features/F17Boost148
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 9eb8b08..18a6030 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 3.3.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Nov 26 2011 Thomas Spura - 3.3.0-8
+- rebuild for https://fedoraproject.org/wiki/Features/F17Boost148
+
* Fri Jul 22 2011 Antti Andreimann - 3.3.0-7
- Rebuilt for boost 1.47.0
From 97f29f98570d6272d85611ad96b854fd75752003 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore
Date: Sat, 14 Jan 2012 03:19:05 -0600
Subject: [PATCH 11/75] - Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 18a6030..6e21e53 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 3.3.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jan 14 2012 Fedora Release Engineering - 3.3.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Sat Nov 26 2011 Thomas Spura - 3.3.0-8
- rebuild for https://fedoraproject.org/wiki/Features/F17Boost148
From a4306638d39cf6bd4d564cd8b121ad249b43b17c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?=
Date: Thu, 19 Jan 2012 07:29:17 +0100
Subject: [PATCH 12/75] Add xsd-3.3.0-gcc47.patch (Fix mass rebuild FTBFS).
---
xsd-3.3.0-gcc47.patch | 36 ++++++++++++++++++++++++++++++++++++
xsd.spec | 7 ++++++-
2 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 xsd-3.3.0-gcc47.patch
diff --git a/xsd-3.3.0-gcc47.patch b/xsd-3.3.0-gcc47.patch
new file mode 100644
index 0000000..d9a4c9d
--- /dev/null
+++ b/xsd-3.3.0-gcc47.patch
@@ -0,0 +1,36 @@
+diff -Naur xsd-3.3.0+dep.orig/libcult/cult/mm/evptr.hxx xsd-3.3.0+dep/libcult/cult/mm/evptr.hxx
+--- xsd-3.3.0+dep.orig/libcult/cult/mm/evptr.hxx 2010-01-01 12:12:06.000000000 +0100
++++ xsd-3.3.0+dep/libcult/cult/mm/evptr.hxx 2012-01-19 06:48:45.713095213 +0100
+@@ -70,7 +70,7 @@
+ Evptr&
+ operator= (Evptr const& ep)
+ {
+- assign (ep.cp_ ? ep.cp_ : ep.p_, ep.c_);
++ this->assign (ep.cp_ ? ep.cp_ : ep.p_, ep.c_);
+
+ return *this;
+ }
+diff -Naur xsd-3.3.0+dep.orig/libcult/cult/mm/shptr.hxx xsd-3.3.0+dep/libcult/cult/mm/shptr.hxx
+--- xsd-3.3.0+dep.orig/libcult/cult/mm/shptr.hxx 2010-01-01 12:12:06.000000000 +0100
++++ xsd-3.3.0+dep/libcult/cult/mm/shptr.hxx 2012-01-19 07:06:45.656894436 +0100
+@@ -53,7 +53,7 @@
+ Shptr&
+ operator= (Shptr const& ap)
+ {
+- assign (ap);
++ this->assign (ap);
+ return *this;
+ }
+
+diff -Naur xsd-3.3.0+dep.orig/xsd/libxsd/xsd/cxx/zc-istream.txx xsd-3.3.0+dep/xsd/libxsd/xsd/cxx/zc-istream.txx
+--- xsd-3.3.0+dep.orig/xsd/libxsd/xsd/cxx/zc-istream.txx 2010-04-28 08:58:09.000000000 +0200
++++ xsd-3.3.0+dep/xsd/libxsd/xsd/cxx/zc-istream.txx 2012-01-19 06:49:34.733902904 +0100
+@@ -32,7 +32,7 @@
+ C* b (const_cast (str_.data ()));
+ C* e (b + str_.size ());
+
+- setg (b, b, e);
++ this->setg (b, b, e);
+ }
+
+ template
diff --git a/xsd.spec b/xsd.spec
index 6e21e53..db54c49 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 3.3.0
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
@@ -10,6 +10,7 @@ URL: http://www.codesynthesis.com/products/xsd/
Source0: http://www.codesynthesis.com/download/xsd/3.2/xsd-%{version}+dep.tar.bz2
# Sent suggestion to upstream via e-mail 20090707
Patch0: xsd-3.3.0-xsdcxx-rename.patch
+Patch1: xsd-3.3.0-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: m4 boost-devel xerces-c-devel
@@ -43,6 +44,7 @@ This package contains API documentation for %{name}.
pushd xsd
%patch0 -p1 -b .xsdcxx-rename
popd
+%patch1 -p1
%build
@@ -123,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jan 19 2012 Ralf Corsépius - 3.3.0-10
+- Add xsd-3.3.0-gcc47.patch (Fix mass rebuild FTBFS).
+
* Sat Jan 14 2012 Fedora Release Engineering - 3.3.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
From c8cdc7a86c5eb715199f79499abbbe374fa61a5e Mon Sep 17 00:00:00 2001
From: Dennis Gilmore
Date: Tue, 28 Feb 2012 14:40:39 -0600
Subject: [PATCH 13/75] - Rebuilt for c++ ABI breakage
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index db54c49..8fec1be 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 3.3.0
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Feb 28 2012 Fedora Release Engineering - 3.3.0-11
+- Rebuilt for c++ ABI breakage
+
* Thu Jan 19 2012 Ralf Corsépius - 3.3.0-10
- Add xsd-3.3.0-gcc47.patch (Fix mass rebuild FTBFS).
From d9bd0cd57045bf51eb3a7f04388acfc190789827 Mon Sep 17 00:00:00 2001
From: Kalev Lember
Date: Wed, 18 Apr 2012 00:37:48 +0300
Subject: [PATCH 14/75] Update to xsd-3.3.0-1+dep upstream tarball, which
includes the gcc 4.7 patch
---
.gitignore | 1 +
sources | 2 +-
xsd-3.3.0-gcc47.patch | 36 ------------------------------------
xsd.spec | 11 ++++++-----
4 files changed, 8 insertions(+), 42 deletions(-)
delete mode 100644 xsd-3.3.0-gcc47.patch
diff --git a/.gitignore b/.gitignore
index 61cd53b..de0efd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
xsd-3.3.0+dep.tar.bz2
+/xsd-3.3.0-1+dep.tar.bz2
diff --git a/sources b/sources
index 4d97448..563f3ce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1bad45103f9111964b78d6f2327fbb15 xsd-3.3.0+dep.tar.bz2
+1cb677f6079809a49bd50d6529463182 xsd-3.3.0-1+dep.tar.bz2
diff --git a/xsd-3.3.0-gcc47.patch b/xsd-3.3.0-gcc47.patch
deleted file mode 100644
index d9a4c9d..0000000
--- a/xsd-3.3.0-gcc47.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur xsd-3.3.0+dep.orig/libcult/cult/mm/evptr.hxx xsd-3.3.0+dep/libcult/cult/mm/evptr.hxx
---- xsd-3.3.0+dep.orig/libcult/cult/mm/evptr.hxx 2010-01-01 12:12:06.000000000 +0100
-+++ xsd-3.3.0+dep/libcult/cult/mm/evptr.hxx 2012-01-19 06:48:45.713095213 +0100
-@@ -70,7 +70,7 @@
- Evptr&
- operator= (Evptr const& ep)
- {
-- assign (ep.cp_ ? ep.cp_ : ep.p_, ep.c_);
-+ this->assign (ep.cp_ ? ep.cp_ : ep.p_, ep.c_);
-
- return *this;
- }
-diff -Naur xsd-3.3.0+dep.orig/libcult/cult/mm/shptr.hxx xsd-3.3.0+dep/libcult/cult/mm/shptr.hxx
---- xsd-3.3.0+dep.orig/libcult/cult/mm/shptr.hxx 2010-01-01 12:12:06.000000000 +0100
-+++ xsd-3.3.0+dep/libcult/cult/mm/shptr.hxx 2012-01-19 07:06:45.656894436 +0100
-@@ -53,7 +53,7 @@
- Shptr&
- operator= (Shptr const& ap)
- {
-- assign (ap);
-+ this->assign (ap);
- return *this;
- }
-
-diff -Naur xsd-3.3.0+dep.orig/xsd/libxsd/xsd/cxx/zc-istream.txx xsd-3.3.0+dep/xsd/libxsd/xsd/cxx/zc-istream.txx
---- xsd-3.3.0+dep.orig/xsd/libxsd/xsd/cxx/zc-istream.txx 2010-04-28 08:58:09.000000000 +0200
-+++ xsd-3.3.0+dep/xsd/libxsd/xsd/cxx/zc-istream.txx 2012-01-19 06:49:34.733902904 +0100
-@@ -32,7 +32,7 @@
- C* b (const_cast (str_.data ()));
- C* e (b + str_.size ());
-
-- setg (b, b, e);
-+ this->setg (b, b, e);
- }
-
- template
diff --git a/xsd.spec b/xsd.spec
index 8fec1be..789e3ec 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,16 +1,15 @@
Name: xsd
Version: 3.3.0
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
# 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.2/xsd-%{version}+dep.tar.bz2
+Source0: http://www.codesynthesis.com/download/xsd/3.3/xsd-%{version}-1+dep.tar.bz2
# Sent suggestion to upstream via e-mail 20090707
Patch0: xsd-3.3.0-xsdcxx-rename.patch
-Patch1: xsd-3.3.0-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: m4 boost-devel xerces-c-devel
@@ -40,11 +39,10 @@ This package contains API documentation for %{name}.
%prep
-%setup -q -n xsd-%{version}+dep
+%setup -q -n xsd-%{version}-1+dep
pushd xsd
%patch0 -p1 -b .xsdcxx-rename
popd
-%patch1 -p1
%build
@@ -125,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Apr 18 2012 Kalev Lember - 3.3.0-12
+- Update to xsd-3.3.0-1+dep upstream tarball, which includes the gcc 4.7 patch
+
* Tue Feb 28 2012 Fedora Release Engineering - 3.3.0-11
- Rebuilt for c++ ABI breakage
From fd62293e4c0a4c164c136011788c9a752b337a4e Mon Sep 17 00:00:00 2001
From: Dennis Gilmore
Date: Sun, 22 Jul 2012 02:16:23 -0500
Subject: [PATCH 15/75] - Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 789e3ec..872c157 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 3.3.0
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jul 22 2012 Fedora Release Engineering - 3.3.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
* Wed Apr 18 2012 Kalev Lember - 3.3.0-12
- Update to xsd-3.3.0-1+dep upstream tarball, which includes the gcc 4.7 patch
From 9f1f11c874aa83e0aa5a1cc8d10c076d44c7cb43 Mon Sep 17 00:00:00 2001
From: Rex Dieter
Date: Sun, 12 Aug 2012 13:54:06 -0500
Subject: [PATCH 16/75] rebuild (boost)
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 872c157..2cf2296 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 3.3.0
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Aug 12 2012 Rex Dieter 3.3.0-14
+- rebuild (boost)
+
* Sun Jul 22 2012 Fedora Release Engineering - 3.3.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
From a104297a717257c782a8de050658756ef10ea53e Mon Sep 17 00:00:00 2001
From: Rex Dieter
Date: Sun, 12 Aug 2012 15:27:24 -0500
Subject: [PATCH 17/75] xsd-3.3.0-2+dep
---
.gitignore | 3 ++-
sources | 2 +-
xsd.spec | 8 ++++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index de0efd1..80616dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
-xsd-3.3.0+dep.tar.bz2
+/xsd-3.3.0+dep.tar.bz2
/xsd-3.3.0-1+dep.tar.bz2
+/xsd-3.3.0-2+dep.tar.bz2
diff --git a/sources b/sources
index 563f3ce..2fd08a7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1cb677f6079809a49bd50d6529463182 xsd-3.3.0-1+dep.tar.bz2
+7ecee5029c119ef678bbe5ca4ef8a288 xsd-3.3.0-2+dep.tar.bz2
diff --git a/xsd.spec b/xsd.spec
index 2cf2296..4874f6d 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -7,7 +7,7 @@ Group: Development/Tools
# 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}-1+dep.tar.bz2
+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)
@@ -39,7 +39,7 @@ This package contains API documentation for %{name}.
%prep
-%setup -q -n xsd-%{version}-1+dep
+%setup -q -n xsd-%{version}-2+dep
pushd xsd
%patch0 -p1 -b .xsdcxx-rename
popd
@@ -58,7 +58,7 @@ popd
%if 0%{?el5}
make verbose=1 CXXFLAGS="$RPM_OPT_FLAGS -g1" BOOST_LINK_SYSTEM=n
%else
-make verbose=1 CXXFLAGS="$RPM_OPT_FLAGS -DBOOST_FILESYSTEM_VERSION=2"
+make verbose=1 CXXFLAGS="$RPM_OPT_FLAGS"
%endif
@@ -124,7 +124,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sun Aug 12 2012 Rex Dieter 3.3.0-14
-- rebuild (boost)
+- xsd-3.3.0-2+dep
* Sun Jul 22 2012 Fedora Release Engineering - 3.3.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
From 8b3aa4b8a524acdff5664ccf43149415b01a390e Mon Sep 17 00:00:00 2001
From: Denis Arnaud
Date: Sat, 9 Feb 2013 23:25:09 +0100
Subject: [PATCH 18/75] Rebuild for Boost-1.53.0
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 4874f6d..56e19e5 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 3.3.0
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Feb 09 2013 Denis Arnaud - 3.3.0-15
+- Rebuild for Boost-1.53.0
+
* Sun Aug 12 2012 Rex Dieter 3.3.0-14
- xsd-3.3.0-2+dep
From 1aa019e3399911edfee65d88c0f9d8387291ca38 Mon Sep 17 00:00:00 2001
From: Petr Machata
Date: Sat, 27 Jul 2013 14:28:51 +0200
Subject: [PATCH 19/75] Rebuild for boost 1.54.0
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 56e19e5..95920d9 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 3.3.0
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jul 27 2013 pmachata@redhat.com - 3.3.0-16
+- Rebuild for boost 1.54.0
+
* Sat Feb 09 2013 Denis Arnaud - 3.3.0-15
- Rebuild for Boost-1.53.0
From 72bbf3daae7f54837a8d68453b7b8c943ac1452b Mon Sep 17 00:00:00 2001
From: Dennis Gilmore
Date: Sun, 4 Aug 2013 04:15:55 -0500
Subject: [PATCH 20/75] - Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 95920d9..4ee70cf 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 3.3.0
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Aug 04 2013 Fedora Release Engineering - 3.3.0-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Sat Jul 27 2013 pmachata@redhat.com - 3.3.0-16
- Rebuild for boost 1.54.0
From a0593b27a268537d6772d3df7fac101468fbebdf Mon Sep 17 00:00:00 2001
From: Petr Machata
Date: Thu, 22 May 2014 23:57:50 +0200
Subject: [PATCH 21/75] Rebuild for boost 1.55.0
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 4ee70cf..8f02e02 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 3.3.0
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu May 22 2014 Petr Machata - 3.3.0-18
+- Rebuild for boost 1.55.0
+
* Sun Aug 04 2013 Fedora Release Engineering - 3.3.0-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
From 6b40f98f1f3fcafd9e012fc47101b1f072a8eea8 Mon Sep 17 00:00:00 2001
From: Peter Robinson
Date: Thu, 5 Jun 2014 22:43:32 +0100
Subject: [PATCH 22/75] Update config.* to fix FTBFS on aarch64/ppc64le
---
xsd.spec | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/xsd.spec b/xsd.spec
index 8f02e02..24520e0 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,16 +1,15 @@
Name: xsd
Version: 3.3.0
-Release: 18%{?dist}
+Release: 19%{?dist}
Summary: W3C XML schema to C++ data binding compiler
-
Group: Development/Tools
# 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)
BuildRequires: m4 boost-devel xerces-c-devel
# Requires: ace-devel - only needed for applications using
@@ -44,6 +43,7 @@ pushd xsd
%patch0 -p1 -b .xsdcxx-rename
popd
+cp /usr/lib/rpm/config.* build-0.3/system
%build
@@ -63,7 +63,6 @@ make verbose=1 CXXFLAGS="$RPM_OPT_FLAGS"
%install
-rm -rf $RPM_BUILD_ROOT
rm -rf apidocdir
%if 0%{?el5}
@@ -106,23 +105,21 @@ find apidocdir -name "*.doxygen" \
-o -name "makefile" \
-o -name "*.html2ps" | xargs rm -f
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(-,root,root,-)
%doc docdir/*
%{_bindir}/xsdcxx
%{_includedir}/xsd/
%{_mandir}/man1/xsdcxx.1*
%files doc
-%defattr(-,root,root,-)
%doc apidocdir/*
%changelog
+* Thu Jun 5 2014 Peter Robinson 3.3.0-19
+- Update config.* to fix FTBFS on aarch64/ppc64le
+
* Thu May 22 2014 Petr Machata - 3.3.0-18
- Rebuild for boost 1.55.0
From 1c363761533a895b45ea260792a0ef5f7ca7f8da Mon Sep 17 00:00:00 2001
From: Dennis Gilmore
Date: Sun, 8 Jun 2014 01:51:45 -0500
Subject: [PATCH 23/75] - Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 24520e0..f3560b0 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 3.3.0
-Release: 19%{?dist}
+Release: 20%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
# Exceptions permit otherwise GPLv2 incompatible combination with ASL 2.0
@@ -117,6 +117,9 @@ find apidocdir -name "*.doxygen" \
%changelog
+* Sun Jun 08 2014 Fedora Release Engineering - 3.3.0-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
* Thu Jun 5 2014 Peter Robinson 3.3.0-19
- Update config.* to fix FTBFS on aarch64/ppc64le
From a050b709c6ebf1cba9c11d0a680876734c81c476 Mon Sep 17 00:00:00 2001
From: Peter Robinson
Date: Mon, 18 Aug 2014 10:59:26 +0000
Subject: [PATCH 24/75] - Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index f3560b0..eb8672f 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 3.3.0
-Release: 20%{?dist}
+Release: 21%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
# Exceptions permit otherwise GPLv2 incompatible combination with ASL 2.0
@@ -117,6 +117,9 @@ find apidocdir -name "*.doxygen" \
%changelog
+* Mon Aug 18 2014 Fedora Release Engineering - 3.3.0-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Sun Jun 08 2014 Fedora Release Engineering - 3.3.0-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
From 64d6f345668c45db9d432b87508559a94856645d Mon Sep 17 00:00:00 2001
From: Petr Machata
Date: Tue, 27 Jan 2015 15:13:04 +0100
Subject: [PATCH 25/75] Rebuild for boost 1.57.0
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index eb8672f..5de6117 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 3.3.0
-Release: 21%{?dist}
+Release: 22%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
# Exceptions permit otherwise GPLv2 incompatible combination with ASL 2.0
@@ -117,6 +117,9 @@ find apidocdir -name "*.doxygen" \
%changelog
+* Tue Jan 27 2015 Petr Machata - 3.3.0-22
+- Rebuild for boost 1.57.0
+
* Mon Aug 18 2014 Fedora Release Engineering - 3.3.0-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
From 9c89509f02e0ddca7fcb607b2056ef5137dcaa75 Mon Sep 17 00:00:00 2001
From: Rex Dieter
Date: Wed, 25 Feb 2015 07:51:17 -0600
Subject: [PATCH 26/75] rebuild (gcc5)
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 5de6117..b31dcf1 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 3.3.0
-Release: 22%{?dist}
+Release: 23%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
# Exceptions permit otherwise GPLv2 incompatible combination with ASL 2.0
@@ -117,6 +117,9 @@ find apidocdir -name "*.doxygen" \
%changelog
+* Wed Feb 25 2015 Rex Dieter 3.3.0-23
+- rebuild (gcc5)
+
* Tue Jan 27 2015 Petr Machata - 3.3.0-22
- Rebuild for boost 1.57.0
From 47aa94ddcbb382630caf0ac5b068bf78042489b6 Mon Sep 17 00:00:00 2001
From: Kalev Lember
Date: Sat, 28 Mar 2015 09:28:35 +0100
Subject: [PATCH 27/75] Update to 4.0.0
---
.gitignore | 1 +
sources | 2 +-
xsd-3.3.0-xsdcxx-rename.patch | 101 ++++++++++++++++++++++------------
xsd.spec | 14 +++--
4 files changed, 76 insertions(+), 42 deletions(-)
diff --git a/.gitignore b/.gitignore
index 80616dd..468f68e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/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
diff --git a/sources b/sources
index 2fd08a7..5d7c13b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ecee5029c119ef678bbe5ca4ef8a288 xsd-3.3.0-2+dep.tar.bz2
+ae64d7fcd258addc9b045fe3f96208bb xsd-4.0.0+dep.tar.bz2
diff --git a/xsd-3.3.0-xsdcxx-rename.patch b/xsd-3.3.0-xsdcxx-rename.patch
index 51495fb..c810ec9 100644
--- a/xsd-3.3.0-xsdcxx-rename.patch
+++ b/xsd-3.3.0-xsdcxx-rename.patch
@@ -1,12 +1,19 @@
-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
+Description: change docu from xsd to xsdcxx
+Author: Jörg Frings-Fürst
+Reviewed-by:
+Last-Update: 2014-07-22
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/xsd/doc/xsd.1
+===================================================================
+--- trunk.orig/xsd/doc/xsd.1 2014-07-21 08:38:41.000000000 +0200
++++ trunk/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
-+.\" groff -man -Tascii xsdcxx.1
+ .\" groff -man -Tascii xsd.1
.\"
- .TH XSD 1 "April 2010" "XSD 3.3.0"
+-.TH XSD 1 "July 2014" "XSD 4.0.0"
++.TH XSDCXX 1 "July 2014" "XSDCXX 4.0.0"
.SH NAME
-xsd \- W3C XML Schema to C++ Compiler
+xsdcxx \- W3C XML Schema to C++ Compiler
@@ -21,7 +28,7 @@ diff -up xsd/documentation/xsd.1.rename xsd/documentation/xsd.1
.I command
.B [
.I options
-@@ -20,19 +20,19 @@ xsd \- W3C XML Schema to C++ Compiler
+@@ -20,19 +20,19 @@
.I file
.B ...]
.in
@@ -44,7 +51,7 @@ diff -up xsd/documentation/xsd.1.rename xsd/documentation/xsd.1
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
+@@ -96,7 +96,7 @@
.PP
.RS
.RS 3
@@ -53,16 +60,20 @@ diff -up xsd/documentation/xsd.1.rename xsd/documentation/xsd.1
.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:
+@@ -133,9 +133,9 @@
- .B hello.xsd. http://example.com/hello
-@@ -1877,7 +1877,7 @@ option. With this approach you don't nee
+ 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 library
+-(\fBlibxsd\fP) to the C++11 mode\. However, if you include any of the XSD
++XSDCXX compiler will automatically add the necessary macro defines to the
++generated header files that will switch the header-only XSDCXX runtime library
++(\fBlibxsd\fP) 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\fP macro
+ for your entire project\.
+@@ -1632,7 +1632,7 @@
.\"
.SH DIAGNOSTICS
If the input file is not a valid W3C XML Schema definition,
@@ -71,9 +82,24 @@ diff -up xsd/documentation/xsd.1.rename xsd/documentation/xsd.1
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
+Index: trunk/xsd/doc/xsd.xhtml
+===================================================================
+--- trunk.orig/xsd/doc/xsd.xhtml 2014-07-21 08:38:41.000000000 +0200
++++ trunk/xsd/doc/xsd.xhtml 2014-07-21 23:29:32.796093697 +0200
+@@ -3,11 +3,11 @@
+
+
+
+- XSD 4.0.0 Compiler Command Line Manual
++ XSDCXX 4.0.0 Compiler Command Line Manual
+
+
+
+-
++
+
+
+
@@ -50,19 +50,19 @@
NAME
@@ -99,25 +125,30 @@ diff -up xsd/documentation/xsd.xhtml.rename xsd/documentation/xsd.xhtml
C++ mapping from W3C XML Schema definitions. Particular mapping to
produce is selected by a command. Each mapping has
a number of mapping-specific options that should
-@@ -104,7 +104,7 @@
+@@ -138,10 +138,10 @@
-
help
-
Print usage information and exit. Use
--
xsd helpcommand
-+
xsdcxx helpcommand
- for command-specific help.
-
+
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 library
++ XSDCXX compiler will automatically add the necessary macro defines to the
++ generated header files that will switch the header-only XSDCXX runtime library
+ (libxsd) to the C++11 mode. However, if you include any
+- of the XSD runtime headers directly in your application (normally you just
++ of the XSDCXX runtime headers directly in your application (normally you just
+ include the generated headers), then you will need to define the
+ XSD_CXX11 macro for your entire project.
-@@ -174,7 +174,7 @@
+@@ -219,7 +219,7 @@
-
For example, if you have file hello.xsd
- with namespace http://example.com/hello and you run
-- xsd on this file, then the string in question
-+ xsdcxx on this file, then the string in question
- will be:
+
For example, if you have file hello.xsd with
+ namespace http://example.com/hello and you run
+- xsd on this file, then the string in question will
++ xsdcxx on this file, then the string in question will
+ be:
-
hello.xsd. http://example.com/hello
-@@ -1575,7 +1575,7 @@ namespace .*
+
hello.xsd. http://example.com/hello
+@@ -1530,7 +1530,7 @@
DIAGNOSTICS
If the input file is not a valid W3C XML Schema definition,
diff --git a/xsd.spec b/xsd.spec
index b31dcf1..347ade1 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,14 +1,15 @@
Name: xsd
-Version: 3.3.0
-Release: 23%{?dist}
+Version: 4.0.0
+Release: 1%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
# 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
+Source0: http://www.codesynthesis.com/download/xsd/4.0/xsd-%{version}+dep.tar.bz2
# 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: xsd-3.3.0-xsdcxx-rename.patch
BuildRequires: m4 boost-devel xerces-c-devel
@@ -38,10 +39,8 @@ This package contains API documentation for %{name}.
%prep
-%setup -q -n xsd-%{version}-2+dep
-pushd xsd
+%setup -q -n xsd-%{version}+dep
%patch0 -p1 -b .xsdcxx-rename
-popd
cp /usr/lib/rpm/config.* build-0.3/system
@@ -117,6 +116,9 @@ find apidocdir -name "*.doxygen" \
%changelog
+* Sat Mar 28 2015 Kalev Lember - 4.0.0-1
+- Update to 4.0.0
+
* Wed Feb 25 2015 Rex Dieter 3.3.0-23
- rebuild (gcc5)
From 968d4b442826bb801d1e7cdb98979ecc78ffd27b Mon Sep 17 00:00:00 2001
From: Kalev Lember
Date: Sat, 2 May 2015 18:47:06 +0200
Subject: [PATCH 28/75] Rebuilt for GCC 5 C++11 ABI change
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 347ade1..665115d 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
# Exceptions permit otherwise GPLv2 incompatible combination with ASL 2.0
@@ -116,6 +116,9 @@ find apidocdir -name "*.doxygen" \
%changelog
+* Sat May 02 2015 Kalev Lember - 4.0.0-2
+- Rebuilt for GCC 5 C++11 ABI change
+
* Sat Mar 28 2015 Kalev Lember - 4.0.0-1
- Update to 4.0.0
From e1fb816ae9d705a4e45baabf42b86a6a81ee4f73 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore
Date: Fri, 19 Jun 2015 04:27:31 +0000
Subject: [PATCH 29/75] - Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 665115d..50fc9d3 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.0.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
# Exceptions permit otherwise GPLv2 incompatible combination with ASL 2.0
@@ -116,6 +116,9 @@ find apidocdir -name "*.doxygen" \
%changelog
+* Fri Jun 19 2015 Fedora Release Engineering - 4.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
* Sat May 02 2015 Kalev Lember - 4.0.0-2
- Rebuilt for GCC 5 C++11 ABI change
From 4d46c2ed39b015232b6eda986fbb6225235b6867 Mon Sep 17 00:00:00 2001
From: David Tardon
Date: Wed, 22 Jul 2015 22:39:25 +0200
Subject: [PATCH 30/75] rebuild for Boost 1.58
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 50fc9d3..c0b111f 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.0.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
# Exceptions permit otherwise GPLv2 incompatible combination with ASL 2.0
@@ -116,6 +116,9 @@ find apidocdir -name "*.doxygen" \
%changelog
+* Wed Jul 22 2015 David Tardon - 4.0.0-4
+- rebuild for Boost 1.58
+
* Fri Jun 19 2015 Fedora Release Engineering - 4.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
From a7303a0607095b138b04239d8c89c538f7972ddf Mon Sep 17 00:00:00 2001
From: Dennis Gilmore
Date: Wed, 29 Jul 2015 13:37:20 -0500
Subject: [PATCH 31/75] - Rebuilt for
https://fedoraproject.org/wiki/Changes/F23Boost159
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index c0b111f..17e0f21 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.0.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
# Exceptions permit otherwise GPLv2 incompatible combination with ASL 2.0
@@ -116,6 +116,9 @@ find apidocdir -name "*.doxygen" \
%changelog
+* Wed Jul 29 2015 Fedora Release Engineering - 4.0.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
+
* Wed Jul 22 2015 David Tardon - 4.0.0-4
- rebuild for Boost 1.58
From ebea1e9c0a9172ef3edff2377af17813c7cdc383 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely
Date: Thu, 27 Aug 2015 17:18:10 +0100
Subject: [PATCH 32/75] Rebuilt for Boost 1.59
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 17e0f21..441b269 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.0.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: W3C XML schema to C++ data binding compiler
Group: Development/Tools
# Exceptions permit otherwise GPLv2 incompatible combination with ASL 2.0
@@ -116,6 +116,9 @@ find apidocdir -name "*.doxygen" \
%changelog
+* Thu Aug 27 2015 Jonathan Wakely - 4.0.0-6
+- Rebuilt for Boost 1.59
+
* Wed Jul 29 2015 Fedora Release Engineering - 4.0.0-5
- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
From 90def860c7d686175365abd0c95a1ec9e74fd383 Mon Sep 17 00:00:00 2001
From: sagitter
Date: Mon, 12 Oct 2015 21:36:24 +0200
Subject: [PATCH 33/75] libcutl libraries unbundled;Header files packaged apart
---
xsd.spec | 96 ++++++++++++++++++++++++++++++++++----------------------
1 file changed, 58 insertions(+), 38 deletions(-)
diff --git a/xsd.spec b/xsd.spec
index 441b269..ef0f73f 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,24 +1,26 @@
Name: xsd
Version: 4.0.0
-Release: 6%{?dist}
+Release: 8%{?dist}
Summary: W3C XML schema to C++ data binding compiler
-Group: Development/Tools
# 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/4.0/xsd-%{version}+dep.tar.bz2
+
# 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: xsd-3.3.0-xsdcxx-rename.patch
-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
+BuildRequires: m4, xerces-c-devel, libcutl-devel
+%if 0%{?rhel}
+BuildRequires: boost148-devel
+%else
+BuildRequires: boost-devel
+%endif
+
+%if 0%{?rhel}
+Requires: boost148
+%endif
%description
CodeSynthesis XSD is an open-source, cross-platform W3C XML Schema to
@@ -29,49 +31,42 @@ 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
+Summary: API documentation files for %{name}
%description doc
This package contains API documentation for %{name}.
+%package devel
+BuildArch: noarch
+Requires: xerces-c-devel
+Summary: Development files of %{name}
+
+%description devel
+This package contains header and development files of %{name}.
%prep
%setup -q -n xsd-%{version}+dep
%patch0 -p1 -b .xsdcxx-rename
-cp /usr/lib/rpm/config.* build-0.3/system
+##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"
+%if 0%{?rhel}
+%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
%endif
-
+make verbose=1 CXX=g++ CC=gcc CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="%{__global_ldflags}" BOOST_LINK_SYSTEM=y EXTERNAL_LIBCUTL=y
%install
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 DESTDIR=$RPM_BUILD_ROOT 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/
@@ -104,18 +99,43 @@ find apidocdir -name "*.doxygen" \
-o -name "makefile" \
-o -name "*.html2ps" | xargs rm -f
+##Test failed on EPEL6 due to "bad" xerces-c
+##http://codesynthesis.com/pipermail/xsd-users/2015-October/004696.html
+%if 0%{?fedora} || 0%{?rhel} >= 7
+%check
+make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
+%endif
%files
-%doc docdir/*
+%{!?_licensedir:%global license %doc}
+%doc docdir/README docdir/NEWS docdir/FLOSSE
+%license docdir/GPLv2 docdir/LICENSE
%{_bindir}/xsdcxx
-%{_includedir}/xsd/
%{_mandir}/man1/xsdcxx.1*
%files doc
+%{!?_licensedir:%global license %doc}
+%doc docdir/README docdir/NEWS docdir/FLOSSE
+%license docdir/GPLv2 docdir/LICENSE
%doc apidocdir/*
+%files devel
+%{!?_licensedir:%global license %doc}
+%doc docdir/README docdir/NEWS docdir/FLOSSE
+%license docdir/GPLv2 docdir/LICENSE
+%{_includedir}/xsd/
%changelog
+* Mon Oct 12 2015 Antonio Trande - 4.0.0-8
+- Requires explicitely Boost148 in EPEL
+- Tests not performed in EPEL6
+
+* Thu Oct 08 2015 Antonio Trande - 4.0.0-7
+- Used %%license tag
+- libcutl libraries unbundled
+- Header files packaged apart
+- Made tests
+
* Thu Aug 27 2015 Jonathan Wakely - 4.0.0-6
- Rebuilt for Boost 1.59
@@ -221,7 +241,7 @@ find apidocdir -name "*.doxygen" \
- Added verbose=1 to MAKEFLAGS so compiler flags could be
verified from build logs.
-* Mon Jul 04 2009 Antti Andreimann 3.2.0-2
+* Sat Jul 04 2009 Antti Andreimann 3.2.0-2
- Changed License tag to clarify which exceptions we are talking about
* Wed May 20 2009 Antti Andreimann 3.2.0-1
From dfec4865b324ffe1c4b5dc6ef49de4b572b6b484 Mon Sep 17 00:00:00 2001
From: sagitter
Date: Mon, 12 Oct 2015 22:21:27 +0200
Subject: [PATCH 34/75] Header files included again in main package
---
xsd.spec | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/xsd.spec b/xsd.spec
index ef0f73f..9906f22 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,12 +1,14 @@
Name: xsd
Version: 4.0.0
-Release: 8%{?dist}
+Release: 9%{?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/4.0/xsd-%{version}+dep.tar.bz2
+Obsoletes: xsd-devel <= 0:4.0.0-9
+
# 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: xsd-3.3.0-xsdcxx-rename.patch
@@ -38,14 +40,6 @@ Summary: API documentation files for %{name}
%description doc
This package contains API documentation for %{name}.
-%package devel
-BuildArch: noarch
-Requires: xerces-c-devel
-Summary: Development files of %{name}
-
-%description devel
-This package contains header and development files of %{name}.
-
%prep
%setup -q -n xsd-%{version}+dep
%patch0 -p1 -b .xsdcxx-rename
@@ -112,6 +106,7 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%license docdir/GPLv2 docdir/LICENSE
%{_bindir}/xsdcxx
%{_mandir}/man1/xsdcxx.1*
+%{_includedir}/xsd/
%files doc
%{!?_licensedir:%global license %doc}
@@ -119,13 +114,10 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%license docdir/GPLv2 docdir/LICENSE
%doc apidocdir/*
-%files devel
-%{!?_licensedir:%global license %doc}
-%doc docdir/README docdir/NEWS docdir/FLOSSE
-%license docdir/GPLv2 docdir/LICENSE
-%{_includedir}/xsd/
-
%changelog
+* Mon Oct 12 2015 Antonio Trande - 4.0.0-9
+- Header files included again in main package
+
* Mon Oct 12 2015 Antonio Trande - 4.0.0-8
- Requires explicitely Boost148 in EPEL
- Tests not performed in EPEL6
From 336a062ad858532c836ea418b3e63ffab7f8adca Mon Sep 17 00:00:00 2001
From: sagitter
Date: Fri, 6 Nov 2015 11:12:32 +0100
Subject: [PATCH 35/75] Add patch to fix bug in C++/Parser Expat Support in
EPEL builds
---
xsd-Fix_bug_C++_Parser_Expat_Support.patch | 59 ++++++++++++++++++++++
xsd.spec | 31 ++++++++----
2 files changed, 80 insertions(+), 10 deletions(-)
create mode 100644 xsd-Fix_bug_C++_Parser_Expat_Support.patch
diff --git a/xsd-Fix_bug_C++_Parser_Expat_Support.patch b/xsd-Fix_bug_C++_Parser_Expat_Support.patch
new file mode 100644
index 0000000..b46fb02
--- /dev/null
+++ b/xsd-Fix_bug_C++_Parser_Expat_Support.patch
@@ -0,0 +1,59 @@
+## Fix bug in C++/Parser Expat Support http://scm.codesynthesis.com/?p=xsd/xsd.git;a=commitdiff;h=94cba986108a0e0f42295572ca42c356d59328d7
+### Author Boris Kolpackov
+## Thu, 24 Jul 2014 11:40:01 +0100 (12:40 +0200)
+### Committer Boris Kolpackov
+## Thu, 24 Jul 2014 11:40:01 +0100 (12:40 +0200)
+--- xsd/libxsd/xsd/cxx/parser/expat/elements.hxx
++++ xsd/libxsd/xsd/cxx/parser/expat/elements.hxx
+@@ -51,7 +51,9 @@ namespace xsd
+ }
+ };
+
+- typedef std::unique_ptr parser_auto_ptr;
++ typedef
++ std::unique_ptr
++ parser_auto_ptr;
+ #else
+ // Simple auto pointer for Expat's XML_Parser object.
+ //
+--- xsd/libxsd/xsd/cxx/parser/expat/elements.txx
++++ xsd/libxsd/xsd/cxx/parser/expat/elements.txx
+@@ -283,9 +283,10 @@ namespace xsd
+ throw std::bad_alloc ();
+
+ if (system_id || public_id)
+- parse_begin (parser, system_id ? *system_id : *public_id, eh);
++ parse_begin (
++ parser.get (), system_id ? *system_id : *public_id, eh);
+ else
+- parse_begin (parser, eh);
++ parse_begin (parser.get (), eh);
+
+ // Temporarily unset the exception failbit. Also clear the
+ // fail bit when we reset the old state if it was caused
+@@ -310,8 +311,10 @@ namespace xsd
+ break;
+ }
+
+- if (XML_Parse (
+- parser, buf, is.gcount (), is.eof ()) == XML_STATUS_ERROR)
++ if (XML_Parse (parser.get (),
++ buf,
++ is.gcount (),
++ is.eof ()) == XML_STATUS_ERROR)
+ {
+ r = false;
+ break;
+##http://scm.codesynthesis.com/?p=xsd/xsd.git;a=commitdiff;h=0e5fab0664fb36c6253dfd7bb86d8985d1b349ef
+--- xsd/libxsd/xsd/cxx/parser/expat/elements.txx
++++ xsd/libxsd/xsd/cxx/parser/expat/elements.txx
+@@ -279,7 +279,7 @@ namespace xsd
+ {
+ parser_auto_ptr parser (XML_ParserCreateNS (0, XML_Char (' ')));
+
+- if (parser == 0)
++ if (parser.get () == 0)
+ throw std::bad_alloc ();
+
+ if (system_id || public_id)
+
diff --git a/xsd.spec b/xsd.spec
index 9906f22..651004d 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,17 +1,21 @@
-Name: xsd
-Version: 4.0.0
-Release: 9%{?dist}
-Summary: W3C XML schema to C++ data binding compiler
+Name: xsd
+Version: 4.0.0
+Release: 10%{?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/4.0/xsd-%{version}+dep.tar.bz2
+License: GPLv2 with exceptions and ASL 2.0
+URL: http://www.codesynthesis.com/products/xsd/
+Source0: http://www.codesynthesis.com/download/xsd/4.0/xsd-%{version}+dep.tar.bz2
-Obsoletes: xsd-devel <= 0:4.0.0-9
+Obsoletes: xsd-devel <= 0:4.0.0-9
# 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: xsd-3.3.0-xsdcxx-rename.patch
+Patch0: %{name}-3.3.0-xsdcxx-rename.patch
+
+# Fix bug in C++/Parser Expat Support
+# http://codesynthesis.com/pipermail/xsd-users/2015-October/004705.html
+Patch1: %{name}-Fix_bug_C++_Parser_Expat_Support.patch
BuildRequires: m4, xerces-c-devel, libcutl-devel
%if 0%{?rhel}
@@ -43,6 +47,9 @@ This package contains API documentation for %{name}.
%prep
%setup -q -n xsd-%{version}+dep
%patch0 -p1 -b .xsdcxx-rename
+%if 0%{?rhel}
+%patch1 -p0
+%endif
##Unbundle libcutl
rm -rf libcutl
@@ -95,7 +102,8 @@ find apidocdir -name "*.doxygen" \
##Test failed on EPEL6 due to "bad" xerces-c
##http://codesynthesis.com/pipermail/xsd-users/2015-October/004696.html
-%if 0%{?fedora} || 0%{?rhel} >= 7
+##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
@@ -115,6 +123,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Fri Nov 06 2015 Antonio Trande - 4.0.0-10
+- Add patch to fix bug in C++/Parser Expat Support in EPEL builds
+
* Mon Oct 12 2015 Antonio Trande - 4.0.0-9
- Header files included again in main package
From 7fdd8a1a0e912aabbbdb008baf7da28e3e51e146 Mon Sep 17 00:00:00 2001
From: sagitter
Date: Wed, 25 Nov 2015 11:50:58 +0100
Subject: [PATCH 36/75] Rebuild for libcutl
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 651004d..82b3891 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.0.0
-Release: 10%{?dist}
+Release: 11%{?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
@@ -123,6 +123,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Wed Nov 25 2015 Antonio Trande - 4.0.0-11
+- Rebuild for libcutl
+
* Fri Nov 06 2015 Antonio Trande - 4.0.0-10
- Add patch to fix bug in C++/Parser Expat Support in EPEL builds
From 037c6a44d38730090f641981e41b19dea8c7e611 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely
Date: Mon, 18 Jan 2016 22:20:06 +0000
Subject: [PATCH 37/75] Rebuilt for Boost 1.60
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 82b3891..41f27a6 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.0.0
-Release: 11%{?dist}
+Release: 12%{?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
@@ -123,6 +123,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Mon Jan 18 2016 Jonathan Wakely - 4.0.0-12
+- Rebuilt for Boost 1.60
+
* Wed Nov 25 2015 Antonio Trande - 4.0.0-11
- Rebuild for libcutl
From c822d0502a71a2f236711bcae32ea5f70dc02cd7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Fri, 5 Feb 2016 03:50:32 +0000
Subject: [PATCH 38/75] - Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 41f27a6..846f5b6 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.0.0
-Release: 12%{?dist}
+Release: 13%{?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
@@ -123,6 +123,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Fri Feb 05 2016 Fedora Release Engineering - 4.0.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
* Mon Jan 18 2016 Jonathan Wakely - 4.0.0-12
- Rebuilt for Boost 1.60
From ec4620313b5b695e149ce0f6cbf873a789173c0e Mon Sep 17 00:00:00 2001
From: sagitter
Date: Fri, 5 Feb 2016 16:08:31 +0100
Subject: [PATCH 39/75] Set flags for hardened builds
---
xsd.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/xsd.spec b/xsd.spec
index 846f5b6..827889c 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.0.0
-Release: 13%{?dist}
+Release: 14%{?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
@@ -55,10 +55,10 @@ This package contains API documentation for %{name}.
rm -rf libcutl
%build
-%if 0%{?rhel}
+%if 0%{?rhel} < 7
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
%endif
-make verbose=1 CXX=g++ CC=gcc CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="%{__global_ldflags}" BOOST_LINK_SYSTEM=y EXTERNAL_LIBCUTL=y
+make verbose=1 CXX=g++ CC=gcc CXXFLAGS="$RPM_OPT_FLAGS -fPIC -pie -Wl,-z,now" LDFLAGS="%{__global_ldflags} -fPIC -pie -Wl,-z,now" BOOST_LINK_SYSTEM=y EXTERNAL_LIBCUTL=y
%install
rm -rf apidocdir
@@ -123,6 +123,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Fri Feb 05 2016 Antonio Trande - 4.0.0-14
+- Set flags for hardened builds
+
* Fri Feb 05 2016 Fedora Release Engineering - 4.0.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
From 9fa97599939c9d3fc7e293485efb61bd42b9e8d8 Mon Sep 17 00:00:00 2001
From: sagitter
Date: Sun, 26 Jun 2016 21:08:24 +0200
Subject: [PATCH 40/75] Remove conditional macro for the Patch1 (bz#1350231).
---
xsd.spec | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/xsd.spec b/xsd.spec
index 827889c..cd6d4e5 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.0.0
-Release: 14%{?dist}
+Release: 15%{?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
@@ -47,9 +47,7 @@ This package contains API documentation for %{name}.
%prep
%setup -q -n xsd-%{version}+dep
%patch0 -p1 -b .xsdcxx-rename
-%if 0%{?rhel}
%patch1 -p0
-%endif
##Unbundle libcutl
rm -rf libcutl
@@ -123,6 +121,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Sun Jun 26 2016 Antonio Trande - 4.0.0-15
+- Remove conditional macro for the Patch1 (bz#1350231)
+
* Fri Feb 05 2016 Antonio Trande - 4.0.0-14
- Set flags for hardened builds
From bdc953283550f71ba002b2ce78d7b005ee622cf8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Sat, 11 Feb 2017 18:09:38 +0000
Subject: [PATCH 41/75] - Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index cd6d4e5..b3f96e6 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.0.0
-Release: 15%{?dist}
+Release: 16%{?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
@@ -121,6 +121,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Sat Feb 11 2017 Fedora Release Engineering - 4.0.0-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
* Sun Jun 26 2016 Antonio Trande - 4.0.0-15
- Remove conditional macro for the Patch1 (bz#1350231)
From c0dba4f6079d62d8307583b9f3c9e31ff05ee411 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Mon, 15 May 2017 20:50:54 +0000
Subject: [PATCH 42/75] - Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index b3f96e6..29a9f19 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.0.0
-Release: 16%{?dist}
+Release: 17%{?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
@@ -121,6 +121,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Mon May 15 2017 Fedora Release Engineering - 4.0.0-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
+
* Sat Feb 11 2017 Fedora Release Engineering - 4.0.0-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
From 19d858257d9ff2329d59086357d7f33a444e7ef1 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely
Date: Tue, 18 Jul 2017 11:31:50 +0100
Subject: [PATCH 43/75] Rebuilt for Boost 1.64
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 29a9f19..efd87de 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.0.0
-Release: 17%{?dist}
+Release: 18%{?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
@@ -121,6 +121,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Tue Jul 18 2017 Jonathan Wakely - 4.0.0-18
+- Rebuilt for Boost 1.64
+
* Mon May 15 2017 Fedora Release Engineering - 4.0.0-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
From 165cbf32b8d891dd9de2e3fb3cd236bd8f3982cb Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Thu, 27 Jul 2017 22:27:26 +0000
Subject: [PATCH 44/75] - Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index efd87de..3fc857a 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.0.0
-Release: 18%{?dist}
+Release: 19%{?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
@@ -121,6 +121,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Thu Jul 27 2017 Fedora Release Engineering - 4.0.0-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
* Tue Jul 18 2017 Jonathan Wakely - 4.0.0-18
- Rebuilt for Boost 1.64
From 6635258d4d1fcbffb38ddfd2f5cbe674be5e824e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Thu, 3 Aug 2017 10:59:23 +0000
Subject: [PATCH 45/75] - Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 3fc857a..a19247f 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.0.0
-Release: 19%{?dist}
+Release: 20%{?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
@@ -121,6 +121,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Thu Aug 03 2017 Fedora Release Engineering - 4.0.0-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
* Thu Jul 27 2017 Fedora Release Engineering - 4.0.0-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
From b13b4e4565b420c97a636ab3b83e3ed9ae8dc8b0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Fri, 9 Feb 2018 22:06:26 +0000
Subject: [PATCH 46/75] - Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index a19247f..b3926d4 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.0.0
-Release: 20%{?dist}
+Release: 21%{?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
@@ -121,6 +121,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Fri Feb 09 2018 Fedora Release Engineering - 4.0.0-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Thu Aug 03 2017 Fedora Release Engineering - 4.0.0-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
From b22228ca3a2f3d23594dc59a402c38201c2dbd06 Mon Sep 17 00:00:00 2001
From: sagitter
Date: Fri, 16 Feb 2018 12:36:01 +0100
Subject: [PATCH 47/75] Patched for xerces-c-3.2 (patch from Debian)
---
sources | 2 +-
xsd-xerces_3-2.patch | 176 +++++++++++++++++++++++++++++++++++++++++++
xsd.spec | 12 ++-
3 files changed, 188 insertions(+), 2 deletions(-)
create mode 100644 xsd-xerces_3-2.patch
diff --git a/sources b/sources
index 5d7c13b..d590b41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ae64d7fcd258addc9b045fe3f96208bb xsd-4.0.0+dep.tar.bz2
+SHA512 (xsd-4.0.0+dep.tar.bz2) = 1b7f5f7a50007e0c739e23c46cf34657845038c3c58f2da4f9978a9486a30674d829e4dfe428af32669207af79375eb8d413ac471c4ffd1c2bc842411f454ae9
diff --git a/xsd-xerces_3-2.patch b/xsd-xerces_3-2.patch
new file mode 100644
index 0000000..aec65c1
--- /dev/null
+++ b/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?=
+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: trunk/xsd/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx
+===================================================================
+--- trunk.orig/xsd/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx
++++ trunk/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: trunk/xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.std
+===================================================================
+--- trunk.orig/xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.std
++++ trunk/xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.std
+@@ -6 +6 @@
+- ???
++ ??
+Index: trunk/xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.xml
+===================================================================
+--- trunk.orig/xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.xml
++++ trunk/xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.xml
+@@ -5,7 +5,7 @@
+ abc
+ æ
+ ¢£¤¥
+- Āꪪ
++ Āꪪ
+
+ abc
+ aâc
+Index: trunk/xsd/tests/cxx/tree/encoding/char/utf-8/driver.cxx
+===================================================================
+--- trunk.orig/xsd/tests/cxx/tree/encoding/char/utf-8/driver.cxx
++++ trunk/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: trunk/xsd/tests/cxx/tree/encoding/char/utf-8/test.std
+===================================================================
+--- trunk.orig/xsd/tests/cxx/tree/encoding/char/utf-8/test.std
++++ trunk/xsd/tests/cxx/tree/encoding/char/utf-8/test.std
+@@ -3,9 +3,7 @@
+ abc
+ Օ
+ ꪪ
+-
+ abc
+ aՕc
+ ꪪbc
+- ab
+
+Index: trunk/xsd/tests/cxx/tree/encoding/char/utf-8/test.xml
+===================================================================
+--- trunk.orig/xsd/tests/cxx/tree/encoding/char/utf-8/test.xml
++++ trunk/xsd/tests/cxx/tree/encoding/char/utf-8/test.xml
+@@ -5,11 +5,9 @@
+ abc
+ Օ
+ ꪪ
+-
+
+ abc
+ aՕc
+ ꪪbc
+- ab
+
+
+Index: trunk/xsd/tests/cxx/tree/encoding/char/utf-8/test.xsd
+===================================================================
+--- trunk.orig/xsd/tests/cxx/tree/encoding/char/utf-8/test.xsd
++++ trunk/xsd/tests/cxx/tree/encoding/char/utf-8/test.xsd
+@@ -9,7 +9,6 @@
+ abc
+ aՕc
+ ꪪbc
+- ab
+
+
+
+@@ -17,7 +16,6 @@
+
+
+
+-
+
+
+
+Index: trunk/xsd/tests/cxx/tree/encoding/wchar/test.std
+===================================================================
+--- trunk.orig/xsd/tests/cxx/tree/encoding/wchar/test.std
++++ trunk/xsd/tests/cxx/tree/encoding/wchar/test.std
+@@ -2,9 +2,9 @@
+
+ abc
+
+- 𐀀
++ ကჿ
+ abc
+ ac
+- 𐀀bc
+- ab𐀀
++ ကჿbc
++ abကჿ
+
+Index: trunk/xsd/tests/cxx/tree/encoding/wchar/test.xml
+===================================================================
+--- trunk.orig/xsd/tests/cxx/tree/encoding/wchar/test.xml
++++ trunk/xsd/tests/cxx/tree/encoding/wchar/test.xml
+@@ -4,11 +4,11 @@
+
+ abc
+
+- 𐀀
++ ကჿ
+
+ abc
+ ac
+- 𐀀bc
+- ab𐀀
++ ကჿbc
++ abကჿ
+
+
+Index: trunk/xsd/tests/cxx/tree/encoding/wchar/test.xsd
+===================================================================
+--- trunk.orig/xsd/tests/cxx/tree/encoding/wchar/test.xsd
++++ trunk/xsd/tests/cxx/tree/encoding/wchar/test.xsd
+@@ -8,16 +8,16 @@
+ Test enum. Valid values are:
+ abc
+ ac
+- 𐀀bc
+- ab𐀀
++ ကჿbc
++ abကჿ
+
+
+
+
+
+
+-
+-
++
++
+
+
+
+
+
diff --git a/xsd.spec b/xsd.spec
index b3926d4..4328ad5 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.0.0
-Release: 21%{?dist}
+Release: 22%{?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
@@ -17,6 +17,10 @@ Patch0: %{name}-3.3.0-xsdcxx-rename.patch
# http://codesynthesis.com/pipermail/xsd-users/2015-October/004705.html
Patch1: %{name}-Fix_bug_C++_Parser_Expat_Support.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
+Patch2: %{name}-xerces_3-2.patch
+
BuildRequires: m4, xerces-c-devel, libcutl-devel
%if 0%{?rhel}
BuildRequires: boost148-devel
@@ -48,6 +52,9 @@ This package contains API documentation for %{name}.
%setup -q -n xsd-%{version}+dep
%patch0 -p1 -b .xsdcxx-rename
%patch1 -p0
+%if 0%{?fedora} > 27
+%patch2 -p1
+%endif
##Unbundle libcutl
rm -rf libcutl
@@ -121,6 +128,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Fri Feb 16 2018 Antonio Trande - 4.0.0-22
+- Patched for xerces-c-3.2 (patch from Debian)
+
* Fri Feb 09 2018 Fedora Release Engineering - 4.0.0-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
From 5333859c218a5dd18fe2bad8566250f8426fbc92 Mon Sep 17 00:00:00 2001
From: sagitter
Date: Thu, 22 Feb 2018 22:24:48 +0100
Subject: [PATCH 48/75] Add gcc-c++ BR
---
xsd.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/xsd.spec b/xsd.spec
index 4328ad5..4fd5b58 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.0.0
-Release: 22%{?dist}
+Release: 23%{?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
@@ -21,7 +21,7 @@ Patch1: %{name}-Fix_bug_C++_Parser_Expat_Support.patch
# https://anonscm.debian.org/cgit/collab-maint/xsd.git/diff/debian/patches/0110-xerces-c3.2.patch?id=442e98604d4158dae11056c4f94aaa655cb480fa
Patch2: %{name}-xerces_3-2.patch
-BuildRequires: m4, xerces-c-devel, libcutl-devel
+BuildRequires: m4, xerces-c-devel, libcutl-devel, gcc-c++
%if 0%{?rhel}
BuildRequires: boost148-devel
%else
@@ -128,6 +128,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Thu Feb 22 2018 Antonio Trande - 4.0.0-23
+- Add gcc-c++ BR
+
* Fri Feb 16 2018 Antonio Trande - 4.0.0-22
- Patched for xerces-c-3.2 (patch from Debian)
From 5222d507f9a8ebf6dd2dae08e35fd286d15637d5 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Sat, 14 Jul 2018 09:35:36 +0000
Subject: [PATCH 49/75] - Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 4fd5b58..4dafc12 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.0.0
-Release: 23%{?dist}
+Release: 24%{?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
@@ -128,6 +128,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Sat Jul 14 2018 Fedora Release Engineering - 4.0.0-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Thu Feb 22 2018 Antonio Trande - 4.0.0-23
- Add gcc-c++ BR
From 45755211e0d2e9cd3b572ad3dbd728d5427e6153 Mon Sep 17 00:00:00 2001
From: sagitter
Date: Sat, 3 Nov 2018 20:02:24 +0100
Subject: [PATCH 50/75] Some minor changes
---
xsd-3.3.0-xsdcxx-rename.patch | 12 ++++----
xsd-xerces_3-2.patch | 58 +++++++++++++++++------------------
xsd.spec | 25 +++++----------
3 files changed, 43 insertions(+), 52 deletions(-)
diff --git a/xsd-3.3.0-xsdcxx-rename.patch b/xsd-3.3.0-xsdcxx-rename.patch
index c810ec9..52cd6ad 100644
--- a/xsd-3.3.0-xsdcxx-rename.patch
+++ b/xsd-3.3.0-xsdcxx-rename.patch
@@ -4,10 +4,10 @@ Reviewed-by:
Last-Update: 2014-07-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/xsd/doc/xsd.1
+Index: xsd/doc/xsd.1
===================================================================
---- trunk.orig/xsd/doc/xsd.1 2014-07-21 08:38:41.000000000 +0200
-+++ trunk/xsd/doc/xsd.1 2014-07-21 23:27:00.928980158 +0200
+--- 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
@@ -82,10 +82,10 @@ Index: trunk/xsd/doc/xsd.1
will issue diagnostic messages to
.B STDERR
and exit with non-zero exit code.
-Index: trunk/xsd/doc/xsd.xhtml
+Index: xsd/doc/xsd.xhtml
===================================================================
---- trunk.orig/xsd/doc/xsd.xhtml 2014-07-21 08:38:41.000000000 +0200
-+++ trunk/xsd/doc/xsd.xhtml 2014-07-21 23:29:32.796093697 +0200
+--- 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 @@
diff --git a/xsd-xerces_3-2.patch b/xsd-xerces_3-2.patch
index aec65c1..c639788 100644
--- a/xsd-xerces_3-2.patch
+++ b/xsd-xerces_3-2.patch
@@ -4,10 +4,10 @@ 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: trunk/xsd/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx
+Index: xsd/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx
===================================================================
---- trunk.orig/xsd/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx
-+++ trunk/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" ||
@@ -17,17 +17,17 @@ Index: trunk/xsd/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx
{
cerr << "invalid encoding" << endl;
return 1;
-Index: trunk/xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.std
+Index: xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.std
===================================================================
---- trunk.orig/xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.std
-+++ trunk/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 @@
- ???
+ ??
Index: trunk/xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.xml
===================================================================
---- trunk.orig/xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.xml
-+++ 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 @@
abcæ
@@ -37,10 +37,10 @@ Index: trunk/xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.xml
abcaâc
-Index: trunk/xsd/tests/cxx/tree/encoding/char/utf-8/driver.cxx
+Index: xsd/tests/cxx/tree/encoding/char/utf-8/driver.cxx
===================================================================
---- trunk.orig/xsd/tests/cxx/tree/encoding/char/utf-8/driver.cxx
-+++ trunk/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" ||
@@ -61,10 +61,10 @@ Index: trunk/xsd/tests/cxx/tree/encoding/char/utf-8/driver.cxx
{
cerr << "invalid encoding" << endl;
return 1;
-Index: trunk/xsd/tests/cxx/tree/encoding/char/utf-8/test.std
+Index: xsd/tests/cxx/tree/encoding/char/utf-8/test.std
===================================================================
---- trunk.orig/xsd/tests/cxx/tree/encoding/char/utf-8/test.std
-+++ trunk/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 @@
abcՕ
@@ -75,10 +75,10 @@ Index: trunk/xsd/tests/cxx/tree/encoding/char/utf-8/test.std
ꪪbc
- ab
-Index: trunk/xsd/tests/cxx/tree/encoding/char/utf-8/test.xml
+Index: xsd/tests/cxx/tree/encoding/char/utf-8/test.xml
===================================================================
---- trunk.orig/xsd/tests/cxx/tree/encoding/char/utf-8/test.xml
-+++ trunk/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 @@
abcՕ
@@ -91,10 +91,10 @@ Index: trunk/xsd/tests/cxx/tree/encoding/char/utf-8/test.xml
- ab
-Index: trunk/xsd/tests/cxx/tree/encoding/char/utf-8/test.xsd
+Index: xsd/tests/cxx/tree/encoding/char/utf-8/test.xsd
===================================================================
---- trunk.orig/xsd/tests/cxx/tree/encoding/char/utf-8/test.xsd
-+++ trunk/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Օc
@@ -111,10 +111,10 @@ Index: trunk/xsd/tests/cxx/tree/encoding/char/utf-8/test.xsd
-Index: trunk/xsd/tests/cxx/tree/encoding/wchar/test.std
+Index: xsd/tests/cxx/tree/encoding/wchar/test.std
===================================================================
---- trunk.orig/xsd/tests/cxx/tree/encoding/wchar/test.std
-+++ trunk/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 @@
abc
@@ -128,10 +128,10 @@ Index: trunk/xsd/tests/cxx/tree/encoding/wchar/test.std
+ ကჿbc
+ abကჿ
-Index: trunk/xsd/tests/cxx/tree/encoding/wchar/test.xml
+Index: xsd/tests/cxx/tree/encoding/wchar/test.xml
===================================================================
---- trunk.orig/xsd/tests/cxx/tree/encoding/wchar/test.xml
-+++ trunk/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 @@
abc
@@ -147,10 +147,10 @@ Index: trunk/xsd/tests/cxx/tree/encoding/wchar/test.xml
+ abကჿ
-Index: trunk/xsd/tests/cxx/tree/encoding/wchar/test.xsd
+Index: xsd/tests/cxx/tree/encoding/wchar/test.xsd
===================================================================
---- trunk.orig/xsd/tests/cxx/tree/encoding/wchar/test.xsd
-+++ trunk/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
diff --git a/xsd.spec b/xsd.spec
index 4dafc12..cbcddc7 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,14 +1,12 @@
Name: xsd
Version: 4.0.0
-Release: 24%{?dist}
+Release: 25%{?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/4.0/xsd-%{version}+dep.tar.bz2
-Obsoletes: xsd-devel <= 0:4.0.0-9
-
# 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}-3.3.0-xsdcxx-rename.patch
@@ -24,14 +22,11 @@ Patch2: %{name}-xerces_3-2.patch
BuildRequires: m4, xerces-c-devel, libcutl-devel, gcc-c++
%if 0%{?rhel}
BuildRequires: boost148-devel
+Requires: boost148%{?_isa}
%else
BuildRequires: boost-devel
%endif
-%if 0%{?rhel}
-Requires: boost148
-%endif
-
%description
CodeSynthesis XSD is an open-source, cross-platform W3C XML Schema to
C++ data binding compiler. Provided with an XML instance specification
@@ -49,12 +44,7 @@ Summary: API documentation files for %{name}
This package contains API documentation for %{name}.
%prep
-%setup -q -n xsd-%{version}+dep
-%patch0 -p1 -b .xsdcxx-rename
-%patch1 -p0
-%if 0%{?fedora} > 27
-%patch2 -p1
-%endif
+%autosetup -p0 -n xsd-%{version}+dep
##Unbundle libcutl
rm -rf libcutl
@@ -63,12 +53,12 @@ rm -rf libcutl
%if 0%{?rhel} < 7
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
%endif
-make verbose=1 CXX=g++ CC=gcc CXXFLAGS="$RPM_OPT_FLAGS -fPIC -pie -Wl,-z,now" LDFLAGS="%{__global_ldflags} -fPIC -pie -Wl,-z,now" BOOST_LINK_SYSTEM=y EXTERNAL_LIBCUTL=y
+%make_build verbose=1 CXX=g++ CC=gcc CXXFLAGS="$RPM_OPT_FLAGS -fPIC -pie -Wl,-z,now" LDFLAGS="%{__global_ldflags} -fPIC -pie -Wl,-z,now" BOOST_LINK_SYSTEM=y EXTERNAL_LIBCUTL=y
%install
rm -rf apidocdir
-make install DESTDIR=$RPM_BUILD_ROOT LDFLAGS="%{__global_ldflags}" install_prefix=$RPM_BUILD_ROOT%{_prefix} \
+%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.
@@ -114,7 +104,6 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%endif
%files
-%{!?_licensedir:%global license %doc}
%doc docdir/README docdir/NEWS docdir/FLOSSE
%license docdir/GPLv2 docdir/LICENSE
%{_bindir}/xsdcxx
@@ -122,12 +111,14 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%{_includedir}/xsd/
%files doc
-%{!?_licensedir:%global license %doc}
%doc docdir/README docdir/NEWS docdir/FLOSSE
%license docdir/GPLv2 docdir/LICENSE
%doc apidocdir/*
%changelog
+* Sat Nov 03 2018 Antonio Trande - 4.0.0-25
+- Some minor changes
+
* Sat Jul 14 2018 Fedora Release Engineering - 4.0.0-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
From b0d34a73cda4e0bda0b0ac13ee7928e29d0616f9 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko
Date: Mon, 28 Jan 2019 08:27:33 +0100
Subject: [PATCH 51/75] Fix RHEL conditions
0%{?rhel} on Fedora expands to 0 which makes condition 0 < 7 true. You don't want that.
Signed-off-by: Igor Gnatenko
---
xsd.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index cbcddc7..9332aa1 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -50,7 +50,7 @@ This package contains API documentation for %{name}.
rm -rf libcutl
%build
-%if 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
%endif
%make_build verbose=1 CXX=g++ CC=gcc CXXFLAGS="$RPM_OPT_FLAGS -fPIC -pie -Wl,-z,now" LDFLAGS="%{__global_ldflags} -fPIC -pie -Wl,-z,now" BOOST_LINK_SYSTEM=y EXTERNAL_LIBCUTL=y
From 214dc792ff78f48594b623ec9e565802d58ed472 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Sun, 3 Feb 2019 12:49:58 +0000
Subject: [PATCH 52/75] - Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 9332aa1..8c3673f 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.0.0
-Release: 25%{?dist}
+Release: 26%{?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
@@ -116,6 +116,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Sun Feb 03 2019 Fedora Release Engineering - 4.0.0-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Sat Nov 03 2018 Antonio Trande - 4.0.0-25
- Some minor changes
From 5f7c286eec336eb54df407b5bfa3ccc1bb23e655 Mon Sep 17 00:00:00 2001
From: sagitter
Date: Thu, 7 Feb 2019 12:45:12 +0100
Subject: [PATCH 53/75] Fix BR required for rhel8
---
xsd.spec | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/xsd.spec b/xsd.spec
index 8c3673f..fc95aae 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.0.0
-Release: 26%{?dist}
+Release: 27%{?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
@@ -20,11 +20,12 @@ Patch1: %{name}-Fix_bug_C++_Parser_Expat_Support.patch
Patch2: %{name}-xerces_3-2.patch
BuildRequires: m4, xerces-c-devel, libcutl-devel, gcc-c++
-%if 0%{?rhel}
+
+%if 0%{?rhel} >= 8 || 0%{?fedora}
+BuildRequires: boost-devel
+%else
BuildRequires: boost148-devel
Requires: boost148%{?_isa}
-%else
-BuildRequires: boost-devel
%endif
%description
@@ -116,6 +117,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Thu Feb 07 2019 Antonio Trande - 4.0.0-27
+- Fix BR required for rhel8
+
* Sun Feb 03 2019 Fedora Release Engineering - 4.0.0-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
From 107a78250f16675359ddd18e344e297a74c79c28 Mon Sep 17 00:00:00 2001
From: sagitter
Date: Fri, 15 Feb 2019 21:04:25 +0100
Subject: [PATCH 54/75] Pre-release 4.1.0.a11
---
.gitignore | 1 +
sources | 2 +-
...ame.patch => xsd-4.1.0-xsdcxx-rename.patch | 79 ++++++++++---------
xsd-Fix_bug_C++_Parser_Expat_Support.patch | 59 --------------
xsd.spec | 31 ++++----
5 files changed, 57 insertions(+), 115 deletions(-)
rename xsd-3.3.0-xsdcxx-rename.patch => xsd-4.1.0-xsdcxx-rename.patch (62%)
delete mode 100644 xsd-Fix_bug_C++_Parser_Expat_Support.patch
diff --git a/.gitignore b/.gitignore
index 468f68e..573f086 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/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
diff --git a/sources b/sources
index d590b41..2f89abf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xsd-4.0.0+dep.tar.bz2) = 1b7f5f7a50007e0c739e23c46cf34657845038c3c58f2da4f9978a9486a30674d829e4dfe428af32669207af79375eb8d413ac471c4ffd1c2bc842411f454ae9
+SHA512 (xsd-4.1.0.a11+dep.tar.bz2) = aee71228511f4eb33132389e91cd15f974ce2384bb1658e61ff502320d5a0c26ce092d2a296facb817906be712c9f661df6baccc4a4f1c25b9b36238c7290f59
diff --git a/xsd-3.3.0-xsdcxx-rename.patch b/xsd-4.1.0-xsdcxx-rename.patch
similarity index 62%
rename from xsd-3.3.0-xsdcxx-rename.patch
rename to xsd-4.1.0-xsdcxx-rename.patch
index 52cd6ad..a4a53e2 100644
--- a/xsd-3.3.0-xsdcxx-rename.patch
+++ b/xsd-4.1.0-xsdcxx-rename.patch
@@ -12,8 +12,8 @@ Index: xsd/doc/xsd.1
.\" Process this file with
.\" groff -man -Tascii xsd.1
.\"
--.TH XSD 1 "July 2014" "XSD 4.0.0"
-+.TH XSDCXX 1 "July 2014" "XSDCXX 4.0.0"
+-.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
@@ -60,20 +60,21 @@ Index: xsd/doc/xsd.1
.I command
.RE
.PP
-@@ -133,9 +133,9 @@
+@@ -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 compiler will automatically add the necessary macro defines to the
--generated header files that will switch the header-only XSD runtime library
--(\fBlibxsd\fP) to the C++11 mode\. However, if you include any of the XSD
-+XSDCXX compiler will automatically add the necessary macro defines to the
-+generated header files that will switch the header-only XSDCXX runtime library
-+(\fBlibxsd\fP) to the C++11 mode\. However, if you include any of the XSDCXX
+ 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\fP macro
- for your entire project\.
-@@ -1632,7 +1632,7 @@
+ 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,
@@ -90,17 +91,17 @@ Index: xsd/doc/xsd.xhtml
-- XSD 4.0.0 Compiler Command Line Manual
-+ XSDCXX 4.0.0 Compiler Command Line Manual
+- XSD 4.1.0 Compiler Command Line Manual
++ XSDCXX 4.1.0 Compiler Command Line Manual
-
+
-
+
-@@ -50,19 +50,19 @@
+@@ -52,19 +52,19 @@
NAME
@@ -125,30 +126,30 @@ Index: xsd/doc/xsd.xhtml
C++ mapping from W3C XML Schema definitions. Particular mapping to
produce is selected by a command. Each mapping has
a number of mapping-specific options that should
-@@ -138,10 +138,10 @@
+@@ -134,10 +134,10 @@
-
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 library
-+ XSDCXX compiler will automatically add the necessary macro defines to the
-+ generated header files that will switch the header-only XSDCXX runtime library
- (libxsd) to the C++11 mode. However, if you include any
-- of the XSD runtime headers directly in your application (normally you just
-+ of the XSDCXX runtime headers directly in your application (normally you just
- include the generated headers), then you will need to define the
- XSD_CXX11 macro for your entire project.
+
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 (libxsd) 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 XSD_CXX11 macro for your entire
+ project.
+@@ -218,7 +218,7 @@
-@@ -219,7 +219,7 @@
+
For example, if you have file hello.xsd with
+ namespace http://example.com/hello and you run
+- xsd on this file, then the string in question will
++ xsdcxx on this file, then the string in question will
+ be:
-
For example, if you have file hello.xsd with
- namespace http://example.com/hello and you run
-- xsd on this file, then the string in question will
-+ xsdcxx on this file, then the string in question will
- be:
-
-
hello.xsd. http://example.com/hello
-@@ -1530,7 +1530,7 @@
+
hello.xsd. http://example.com/hello
+@@ -1564,7 +1564,7 @@
DIAGNOSTICS
If the input file is not a valid W3C XML Schema definition,
diff --git a/xsd-Fix_bug_C++_Parser_Expat_Support.patch b/xsd-Fix_bug_C++_Parser_Expat_Support.patch
deleted file mode 100644
index b46fb02..0000000
--- a/xsd-Fix_bug_C++_Parser_Expat_Support.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-## Fix bug in C++/Parser Expat Support http://scm.codesynthesis.com/?p=xsd/xsd.git;a=commitdiff;h=94cba986108a0e0f42295572ca42c356d59328d7
-### Author Boris Kolpackov
-## Thu, 24 Jul 2014 11:40:01 +0100 (12:40 +0200)
-### Committer Boris Kolpackov
-## Thu, 24 Jul 2014 11:40:01 +0100 (12:40 +0200)
---- xsd/libxsd/xsd/cxx/parser/expat/elements.hxx
-+++ xsd/libxsd/xsd/cxx/parser/expat/elements.hxx
-@@ -51,7 +51,9 @@ namespace xsd
- }
- };
-
-- typedef std::unique_ptr parser_auto_ptr;
-+ typedef
-+ std::unique_ptr
-+ parser_auto_ptr;
- #else
- // Simple auto pointer for Expat's XML_Parser object.
- //
---- xsd/libxsd/xsd/cxx/parser/expat/elements.txx
-+++ xsd/libxsd/xsd/cxx/parser/expat/elements.txx
-@@ -283,9 +283,10 @@ namespace xsd
- throw std::bad_alloc ();
-
- if (system_id || public_id)
-- parse_begin (parser, system_id ? *system_id : *public_id, eh);
-+ parse_begin (
-+ parser.get (), system_id ? *system_id : *public_id, eh);
- else
-- parse_begin (parser, eh);
-+ parse_begin (parser.get (), eh);
-
- // Temporarily unset the exception failbit. Also clear the
- // fail bit when we reset the old state if it was caused
-@@ -310,8 +311,10 @@ namespace xsd
- break;
- }
-
-- if (XML_Parse (
-- parser, buf, is.gcount (), is.eof ()) == XML_STATUS_ERROR)
-+ if (XML_Parse (parser.get (),
-+ buf,
-+ is.gcount (),
-+ is.eof ()) == XML_STATUS_ERROR)
- {
- r = false;
- break;
-##http://scm.codesynthesis.com/?p=xsd/xsd.git;a=commitdiff;h=0e5fab0664fb36c6253dfd7bb86d8985d1b349ef
---- xsd/libxsd/xsd/cxx/parser/expat/elements.txx
-+++ xsd/libxsd/xsd/cxx/parser/expat/elements.txx
-@@ -279,7 +279,7 @@ namespace xsd
- {
- parser_auto_ptr parser (XML_ParserCreateNS (0, XML_Char (' ')));
-
-- if (parser == 0)
-+ if (parser.get () == 0)
- throw std::bad_alloc ();
-
- if (system_id || public_id)
-
diff --git a/xsd.spec b/xsd.spec
index fc95aae..e989339 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,31 +1,26 @@
Name: xsd
-Version: 4.0.0
-Release: 27%{?dist}
+Version: 4.1.0
+Release: 0.1.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/4.0/xsd-%{version}+dep.tar.bz2
+URL: https://www.codesynthesis.com/products/xsd/
+Source0: https://codesynthesis.com/~boris/tmp/xsd/%{version}.a11/xsd-%{version}.a11+dep.tar.bz2
# 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}-3.3.0-xsdcxx-rename.patch
-
-# Fix bug in C++/Parser Expat Support
-# http://codesynthesis.com/pipermail/xsd-users/2015-October/004705.html
-Patch1: %{name}-Fix_bug_C++_Parser_Expat_Support.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
-Patch2: %{name}-xerces_3-2.patch
+Patch1: %{name}-xerces_3-2.patch
BuildRequires: m4, xerces-c-devel, libcutl-devel, gcc-c++
-
-%if 0%{?rhel} >= 8 || 0%{?fedora}
-BuildRequires: boost-devel
-%else
+%if 0%{?rhel}
BuildRequires: boost148-devel
Requires: boost148%{?_isa}
+%else
+BuildRequires: boost-devel
%endif
%description
@@ -39,19 +34,20 @@ dealing with intricacies of reading and writing XML.
%package doc
BuildArch: noarch
+BuildRequires: ghostscript
Summary: API documentation files for %{name}
%description doc
This package contains API documentation for %{name}.
%prep
-%autosetup -p0 -n xsd-%{version}+dep
+%autosetup -p0 -n xsd-%{version}.a11+dep
##Unbundle libcutl
rm -rf libcutl
%build
-%if 0%{?rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} < 7
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
%endif
%make_build verbose=1 CXX=g++ CC=gcc CXXFLAGS="$RPM_OPT_FLAGS -fPIC -pie -Wl,-z,now" LDFLAGS="%{__global_ldflags} -fPIC -pie -Wl,-z,now" BOOST_LINK_SYSTEM=y EXTERNAL_LIBCUTL=y
@@ -117,6 +113,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Fri Feb 15 2019 Antonio Trande - 4.1.0-0.1.a11
+- Pre-release 4.1.0.a11
+
* Thu Feb 07 2019 Antonio Trande - 4.0.0-27
- Fix BR required for rhel8
From 096a19a1027054f2873a9b4116a305224caedc15 Mon Sep 17 00:00:00 2001
From: sagitter
Date: Fri, 15 Feb 2019 21:09:40 +0100
Subject: [PATCH 55/75] Reinsert patch for rhel8 builds
---
xsd.spec | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/xsd.spec b/xsd.spec
index e989339..302b6ca 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -16,11 +16,12 @@ Patch0: %{name}-%{version}-xsdcxx-rename.patch
Patch1: %{name}-xerces_3-2.patch
BuildRequires: m4, xerces-c-devel, libcutl-devel, gcc-c++
-%if 0%{?rhel}
+
+%if 0%{?rhel} >= 8 || 0%{?fedora}
+BuildRequires: boost-devel
+%else
BuildRequires: boost148-devel
Requires: boost148%{?_isa}
-%else
-BuildRequires: boost-devel
%endif
%description
From 25d32672764d1f072241ed02910f9a8dc5e3a83d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Sat, 27 Jul 2019 04:39:17 +0000
Subject: [PATCH 56/75] - Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 302b6ca..4e7ca7d 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.1.0
-Release: 0.1.a11%{?dist}
+Release: 0.2.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
@@ -114,6 +114,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Sat Jul 27 2019 Fedora Release Engineering - 4.1.0-0.2.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
* Fri Feb 15 2019 Antonio Trande - 4.1.0-0.1.a11
- Pre-release 4.1.0.a11
From ad5162f1c4c5400646e020a1f6355932235da400 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Fri, 31 Jan 2020 04:56:02 +0000
Subject: [PATCH 57/75] - Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 4e7ca7d..1f22081 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.1.0
-Release: 0.2.a11%{?dist}
+Release: 0.3.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
@@ -114,6 +114,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Fri Jan 31 2020 Fedora Release Engineering - 4.1.0-0.3.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Sat Jul 27 2019 Fedora Release Engineering - 4.1.0-0.2.a11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
From e1b10a0eb364d412da20b5b6bbf569b625fa172a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Wed, 29 Jul 2020 15:05:44 +0000
Subject: [PATCH 58/75] - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 1f22081..0674cf5 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.1.0
-Release: 0.3.a11%{?dist}
+Release: 0.4.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
@@ -114,6 +114,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Wed Jul 29 2020 Fedora Release Engineering - 4.1.0-0.4.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Fri Jan 31 2020 Fedora Release Engineering - 4.1.0-0.3.a11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
From 5f201fafd652c29098e89a979d58f0076f1e7b33 Mon Sep 17 00:00:00 2001
From: Jeff Law
Date: Wed, 29 Jul 2020 10:50:59 -0600
Subject: [PATCH 59/75] Force C++14 as this code is not C++17 ready
---
xsd.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/xsd.spec b/xsd.spec
index 0674cf5..939f6f1 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.1.0
-Release: 0.4.a11%{?dist}
+Release: 0.5.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
@@ -51,7 +51,7 @@ rm -rf libcutl
%if 0%{?rhel} < 7
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
%endif
-%make_build verbose=1 CXX=g++ CC=gcc CXXFLAGS="$RPM_OPT_FLAGS -fPIC -pie -Wl,-z,now" LDFLAGS="%{__global_ldflags} -fPIC -pie -Wl,-z,now" BOOST_LINK_SYSTEM=y EXTERNAL_LIBCUTL=y
+%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 apidocdir
@@ -114,6 +114,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Wed Jul 29 2020 Jeff Law - 4.1.0-0.5.a11
+- Force C++14 as this code is not C++17 ready
+
* Wed Jul 29 2020 Fedora Release Engineering - 4.1.0-0.4.a11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
From ebfb97eab8996fa4751ba5ff17fae14f294b9b43 Mon Sep 17 00:00:00 2001
From: Tom Stellard
Date: Tue, 12 Jan 2021 01:53:49 +0000
Subject: [PATCH 60/75] Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
xsd.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/xsd.spec b/xsd.spec
index 939f6f1..8ac1d6e 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -15,6 +15,7 @@ Patch0: %{name}-%{version}-xsdcxx-rename.patch
# 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}
From 9cf2ce70c65c3c3cb1db7a4d50cbd7617ef6ff55 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Thu, 28 Jan 2021 00:24:21 +0000
Subject: [PATCH 61/75] - Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 8ac1d6e..d0a7f9c 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.1.0
-Release: 0.5.a11%{?dist}
+Release: 0.6.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
@@ -115,6 +115,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Thu Jan 28 2021 Fedora Release Engineering - 4.1.0-0.6.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Wed Jul 29 2020 Jeff Law - 4.1.0-0.5.a11
- Force C++14 as this code is not C++17 ready
From a24e3566583e95c25e8232393672026769df7b1e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Fri, 23 Jul 2021 21:58:01 +0000
Subject: [PATCH 62/75] - Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index d0a7f9c..b4d054b 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.1.0
-Release: 0.6.a11%{?dist}
+Release: 0.7.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
@@ -115,6 +115,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Fri Jul 23 2021 Fedora Release Engineering - 4.1.0-0.7.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Thu Jan 28 2021 Fedora Release Engineering - 4.1.0-0.6.a11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
From 6635cb669b07e0af1952bba7a49a87e692e48957 Mon Sep 17 00:00:00 2001
From: Antonio Trande
Date: Fri, 7 Jan 2022 20:08:31 +0100
Subject: [PATCH 63/75] Rebuild for EPEL9
---
xsd.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/xsd.spec b/xsd.spec
index b4d054b..dac641f 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.1.0
-Release: 0.7.a11%{?dist}
+Release: 0.8.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
@@ -49,9 +49,6 @@ This package contains API documentation for %{name}.
rm -rf libcutl
%build
-%if 0%{?rhel} < 7
-%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
-%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
@@ -115,6 +112,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Fri Jan 07 2022 Antonio Trande - 4.1.0-0.8.a11
+- Rebuild for EPEL9
+
* Fri Jul 23 2021 Fedora Release Engineering - 4.1.0-0.7.a11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
From cff905e207c2237e7a3f3e0f03c355b5b79f276f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Sat, 22 Jan 2022 05:31:33 +0000
Subject: [PATCH 64/75] - Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index dac641f..fe64458 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.1.0
-Release: 0.8.a11%{?dist}
+Release: 0.9.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
@@ -112,6 +112,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Sat Jan 22 2022 Fedora Release Engineering - 4.1.0-0.9.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
* Fri Jan 07 2022 Antonio Trande - 4.1.0-0.8.a11
- Rebuild for EPEL9
From 39880300072290fe03bebab8f31f60df817afd78 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Sat, 23 Jul 2022 13:33:01 +0000
Subject: [PATCH 65/75] Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index fe64458..df82d2e 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.1.0
-Release: 0.9.a11%{?dist}
+Release: 0.10.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
@@ -112,6 +112,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Sat Jul 23 2022 Fedora Release Engineering - 4.1.0-0.10.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
* Sat Jan 22 2022 Fedora Release Engineering - 4.1.0-0.9.a11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
From 713b3cd8dd51c1fe94363a2de87ca760e73084da Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Sat, 21 Jan 2023 07:53:01 +0000
Subject: [PATCH 66/75] Rebuilt for
https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index df82d2e..468065d 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.1.0
-Release: 0.10.a11%{?dist}
+Release: 0.11.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
@@ -112,6 +112,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Sat Jan 21 2023 Fedora Release Engineering - 4.1.0-0.11.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
* Sat Jul 23 2022 Fedora Release Engineering - 4.1.0-0.10.a11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
From 2fcbf08fff9e92354c698085a6f0aed2eab0861f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Sat, 22 Jul 2023 19:18:23 +0000
Subject: [PATCH 67/75] Rebuilt for
https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 468065d..7b22262 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.1.0
-Release: 0.11.a11%{?dist}
+Release: 0.12.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
@@ -112,6 +112,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Sat Jul 22 2023 Fedora Release Engineering - 4.1.0-0.12.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
* Sat Jan 21 2023 Fedora Release Engineering - 4.1.0-0.11.a11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
From 207e4e7264375effed92a923a336559aaebe8099 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Sat, 27 Jan 2024 10:12:16 +0000
Subject: [PATCH 68/75] Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 7b22262..037fd59 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.1.0
-Release: 0.12.a11%{?dist}
+Release: 0.13.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
@@ -112,6 +112,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Sat Jan 27 2024 Fedora Release Engineering - 4.1.0-0.13.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
* Sat Jul 22 2023 Fedora Release Engineering - 4.1.0-0.12.a11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
From 9205086268fac64ca5e578e9aec1eb043686edfb Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Sat, 20 Jul 2024 10:29:05 +0000
Subject: [PATCH 69/75] Rebuilt for
https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 037fd59..538fac0 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.1.0
-Release: 0.13.a11%{?dist}
+Release: 0.14.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
@@ -112,6 +112,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Sat Jul 20 2024 Fedora Release Engineering - 4.1.0-0.14.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
* Sat Jan 27 2024 Fedora Release Engineering - 4.1.0-0.13.a11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
From 23e442c471861fe6d999ba765453633b5f6eb5b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?=
Date: Wed, 4 Sep 2024 22:58:07 +0200
Subject: [PATCH 70/75] convert license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
---
xsd.spec | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/xsd.spec b/xsd.spec
index 538fac0..299f85a 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,9 +1,10 @@
Name: xsd
Version: 4.1.0
-Release: 0.14.a11%{?dist}
+Release: 0.15.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
+# 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
@@ -112,6 +113,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Wed Sep 04 2024 Miroslav Suchý - 4.1.0-0.15.a11
+- convert license to SPDX
+
* Sat Jul 20 2024 Fedora Release Engineering - 4.1.0-0.14.a11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
From 77e736049c0406ee4d84676fff048bc67d50d443 Mon Sep 17 00:00:00 2001
From: Pete Walter
Date: Fri, 18 Oct 2024 14:10:15 +0100
Subject: [PATCH 71/75] Rebuild for xerces-c 3.3
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 299f85a..d77a453 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.1.0
-Release: 0.15.a11%{?dist}
+Release: 0.16.a11%{?dist}
Summary: W3C XML schema to C++ data binding compiler
# Exceptions permit otherwise GPLv2 incompatible combination with ASL 2.0
# Automatically converted from old format: GPLv2 with exceptions and ASL 2.0 - review is highly recommended.
@@ -113,6 +113,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Fri Oct 18 2024 Pete Walter - 4.1.0-0.16.a11
+- Rebuild for xerces-c 3.3
+
* Wed Sep 04 2024 Miroslav Suchý - 4.1.0-0.15.a11
- convert license to SPDX
From c75752635c81d8b74c7d62b41bfb847f69447ff9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Sun, 19 Jan 2025 16:19:15 +0000
Subject: [PATCH 72/75] Rebuilt for
https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index d77a453..cf769cf 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.1.0
-Release: 0.16.a11%{?dist}
+Release: 0.17.a11%{?dist}
Summary: W3C XML schema to C++ data binding compiler
# Exceptions permit otherwise GPLv2 incompatible combination with ASL 2.0
# Automatically converted from old format: GPLv2 with exceptions and ASL 2.0 - review is highly recommended.
@@ -113,6 +113,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Sun Jan 19 2025 Fedora Release Engineering - 4.1.0-0.17.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
* Fri Oct 18 2024 Pete Walter - 4.1.0-0.16.a11
- Rebuild for xerces-c 3.3
From 2da2e59c209a77e498c9e43b995701ec692f8d25 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Fri, 25 Jul 2025 21:05:14 +0000
Subject: [PATCH 73/75] Rebuilt for
https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index cf769cf..4f007a4 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.1.0
-Release: 0.17.a11%{?dist}
+Release: 0.18.a11%{?dist}
Summary: W3C XML schema to C++ data binding compiler
# Exceptions permit otherwise GPLv2 incompatible combination with ASL 2.0
# Automatically converted from old format: GPLv2 with exceptions and ASL 2.0 - review is highly recommended.
@@ -113,6 +113,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Fri Jul 25 2025 Fedora Release Engineering - 4.1.0-0.18.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
* Sun Jan 19 2025 Fedora Release Engineering - 4.1.0-0.17.a11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
From 1123d4df4646191216702840c1fc1269222d7b0a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Sat, 17 Jan 2026 20:54:29 +0000
Subject: [PATCH 74/75] Rebuilt for
https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 4f007a4..7bc17d9 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.1.0
-Release: 0.18.a11%{?dist}
+Release: 0.19.a11%{?dist}
Summary: W3C XML schema to C++ data binding compiler
# Exceptions permit otherwise GPLv2 incompatible combination with ASL 2.0
# Automatically converted from old format: GPLv2 with exceptions and ASL 2.0 - review is highly recommended.
@@ -113,6 +113,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Sat Jan 17 2026 Fedora Release Engineering - 4.1.0-0.19.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
* Fri Jul 25 2025 Fedora Release Engineering - 4.1.0-0.18.a11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
From a88025b3d57daca47a7deeb303fd6f71cace7200 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering
Date: Fri, 17 Jul 2026 09:27:09 +0000
Subject: [PATCH 75/75] Rebuilt for
https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
---
xsd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xsd.spec b/xsd.spec
index 7bc17d9..5072f3c 100644
--- a/xsd.spec
+++ b/xsd.spec
@@ -1,6 +1,6 @@
Name: xsd
Version: 4.1.0
-Release: 0.19.a11%{?dist}
+Release: 0.20.a11%{?dist}
Summary: W3C XML schema to C++ data binding compiler
# Exceptions permit otherwise GPLv2 incompatible combination with ASL 2.0
# Automatically converted from old format: GPLv2 with exceptions and ASL 2.0 - review is highly recommended.
@@ -113,6 +113,9 @@ make -j 1 test EXTERNAL_LIBCUTL=y BOOST_LINK_SYSTEM=y
%doc apidocdir/*
%changelog
+* Fri Jul 17 2026 Fedora Release Engineering - 4.1.0-0.20.a11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
* Sat Jan 17 2026 Fedora Release Engineering - 4.1.0-0.19.a11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild