From dfec4865b324ffe1c4b5dc6ef49de4b572b6b484 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Oct 12 2015 20:21:27 +0000
Subject: Header files included again in main package


---

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 <sagitterATfedoraproject.org> - 4.0.0-9
+- Header files included again in main package
+
 * Mon Oct 12 2015 Antonio Trande <sagitterATfedoraproject.org> - 4.0.0-8
 - Requires explicitely Boost148 in EPEL
 - Tests not performed in EPEL6