rpms/xsd/EL-6 xsd-3.3.0-xsdcxx-rename.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3 xsd.spec, 1.3, 1.4 xsd-3.2.0-manfix.patch, 1.1, NONE xsd-3.2.0-xsdcxx-rename.patch, 1.1, NONE

Antti Andreimann anttix at fedoraproject.org
Sun Jun 20 14:16:47 UTC 2010


Author: anttix

Update of /cvs/pkgs/rpms/xsd/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31628/EL-6

Modified Files:
	.cvsignore import.log sources xsd.spec 
Added Files:
	xsd-3.3.0-xsdcxx-rename.patch 
Removed Files:
	xsd-3.2.0-manfix.patch xsd-3.2.0-xsdcxx-rename.patch 
Log Message:
Updated to xsd 3.3.0


xsd-3.3.0-xsdcxx-rename.patch:
 xsd.1     |   18 +++++++++---------
 xsd.xhtml |   16 ++++++++--------
 2 files changed, 17 insertions(+), 17 deletions(-)

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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xsd/EL-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Jul 2009 11:03:46 -0000	1.2
+++ .cvsignore	20 Jun 2010 14:16:47 -0000	1.3
@@ -1 +1 @@
-xsd-3.2.0+dep.tar.bz2
+xsd-3.3.0+dep.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xsd/EL-6/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	7 Jul 2009 11:03:46 -0000	1.1
+++ import.log	20 Jun 2010 14:16:47 -0000	1.2
@@ -1 +1,2 @@
 xsd-3_2_0-3_fc10:HEAD:xsd-3.2.0-3.fc10.src.rpm:1246964574
+xsd-3_3_0-1_fc13:EL-6:xsd-3.3.0-1.fc13.src.rpm:1277043371


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsd/EL-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Jul 2009 11:03:46 -0000	1.2
+++ sources	20 Jun 2010 14:16:47 -0000	1.3
@@ -1 +1 @@
-db1ad2ea36ae987c8cad939b2b07b152  xsd-3.2.0+dep.tar.bz2
+1bad45103f9111964b78d6f2327fbb15  xsd-3.3.0+dep.tar.bz2


Index: xsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsd/EL-6/xsd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xsd.spec	27 Jul 2009 08:44:50 -0000	1.3
+++ xsd.spec	20 Jun 2010 14:16:47 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           xsd
-Version:        3.2.0
-Release:        5%{?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 
 
 %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,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jun 20 2010 Antti Andreimann <Antti.Andreimann at mail.ee> 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 <caolanm at redhat.com> - 3.2.0-7
+- Rebuild for xerces soname bump
+
+* Fri Jan 22 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 3.2.0-6
+- Rebuild for Boost soname bump
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- xsd-3.2.0-manfix.patch DELETED ---


--- xsd-3.2.0-xsdcxx-rename.patch DELETED ---



More information about the scm-commits mailing list