dist-git conversion

.cvsignore

@@ -1 +0,0 @@
-xsd-3.2.0+dep.tar.bz2

.gitignore

@@ -0,0 +1 @@
+xsd-3.3.0+dep.tar.bz2

Makefile

@@ -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)

import.log

@@ -1 +0,0 @@
-xsd-3_2_0-3_fc10:HEAD:xsd-3.2.0-3.fc10.src.rpm:1246964574

sources

@@ -1 +1 @@
-db1ad2ea36ae987c8cad939b2b07b152  xsd-3.2.0+dep.tar.bz2
+1bad45103f9111964b78d6f2327fbb15  xsd-3.3.0+dep.tar.bz2

xsd-3.2.0-manfix.patch

@@ -1,12 +0,0 @@
-diff -up xsd-3.2.0-2/documentation/xsd.1.manfix xsd-3.2.0-2/documentation/xsd.1
---- xsd-3.2.0-2/documentation/xsd.1.manfix	2009-05-20 23:10:39.000000000 +0300
-+++ xsd-3.2.0-2/documentation/xsd.1	2009-05-20 23:13:21.000000000 +0300
-@@ -1697,7 +1697,7 @@ will issue diagnostic messages to
- and exit with non-zero exit code.
- .SH BUGS
- Send bug reports to the xsd-users@codesynthesis.com mailing list.
--./' SH SEE ALSO
-+.SH SEE ALSO
- .SH COPYRIGHT
- Copyright (c) 2005-2008 Code Synthesis Tools CC.
- 

xsd-3.3.0-xsdcxx-rename.patch

@@ -1,9 +1,12 @@
-diff -up xsd-3.2.0-2/documentation/xsd.1.xsdcxx-rename xsd-3.2.0-2/documentation/xsd.1
---- xsd-3.2.0-2/documentation/xsd.1.xsdcxx-rename	2008-09-23 13:36:25.000000000 +0300
-+++ xsd-3.2.0-2/documentation/xsd.1	2009-05-20 23:10:39.000000000 +0300
-@@ -3,14 +3,14 @@
+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 "September 2008" "XSD 3.2.0"
+ .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
@@ -50,25 +53,16 @@ diff -up xsd-3.2.0-2/documentation/xsd.1.xsdcxx-rename xsd-3.2.0-2/documentation
  .I command
  .RE
  .PP
-@@ -181,7 +181,7 @@ for the current translation unit is empt
+@@ -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 would be:
+ on this file, then the string in question will be:
  
- .B \ http://example.com/hello
-@@ -550,7 +550,7 @@ for the current translation unit is empt
- with namespace
- .B http://example.com/hello
- and you run
--.B xsd
-+.B xsdcxx
- on this file, then the string in question would be:
- 
- .B \ http://example.com/hello element
-@@ -1691,7 +1691,7 @@ option. With this approach you don't nee
+ .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,
@@ -77,9 +71,9 @@ diff -up xsd-3.2.0-2/documentation/xsd.1.xsdcxx-rename xsd-3.2.0-2/documentation
  will issue diagnostic messages to
  .B STDERR
  and exit with non-zero exit code.
-diff -up xsd-3.2.0-2/documentation/xsd.xhtml.xsdcxx-rename xsd-3.2.0-2/documentation/xsd.xhtml
---- xsd-3.2.0-2/documentation/xsd.xhtml.xsdcxx-rename	2008-08-07 14:54:35.000000000 +0300
-+++ xsd-3.2.0-2/documentation/xsd.xhtml	2009-05-20 23:10:39.000000000 +0300
+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>
@@ -114,25 +108,16 @@ diff -up xsd-3.2.0-2/documentation/xsd.xhtml.xsdcxx-rename xsd-3.2.0-2/documenta
        for command-specific help.
      </dd>
  
-@@ -164,7 +164,7 @@
-       <p>The <code><i>filename</i></code> for the current translation unit
-         is empty. For example, if you have file <code><b>hello.xsd</b></code>
+@@ -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
-         would be:</p>
+         will be:</p>
  
-       <p><code>&nbsp;<b>http://example.com/hello</b></code></p>
-@@ -493,7 +493,7 @@
-       <p>The <code><i>filename</i></code> for the current translation unit
-         is empty. 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
-         would be:</p>
- 
-       <p><code>&nbsp;<b>http://example.com/hello element</b></code></p>
-@@ -1447,7 +1447,7 @@ namespace .*
+       <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,

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 <Antti.Andreimann@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@redhat.com> - 3.2.0-7
 - Rebuild for xerces soname bump