[castor] Update for merge review comments and fix rawhide build

[mbooth]

commit 498d5b75ee7cb2187c0c5723f2bfc47f5fa180b7
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Wed Nov 27 13:05:42 2013 +0000

    Update for merge review comments and fix rawhide build

 ...atch => castor-1.3.2-fix-unmappable-chars.patch |    0
 castor.spec                                        |   30 ++++++++++++-------
 2 files changed, 19 insertions(+), 11 deletions(-)
---
diff --git a/castor-fix-unmappable-chars.patch b/castor-1.3.2-fix-unmappable-chars.patch
similarity index 100%
rename from castor-fix-unmappable-chars.patch
rename to castor-1.3.2-fix-unmappable-chars.patch
diff --git a/castor.spec b/castor.spec
index 7f2c0fd..2fa854e 100644
--- a/castor.spec
+++ b/castor.spec
@@ -1,13 +1,12 @@
 Summary:        An open source data binding framework for Java
 Name:           castor
 Version:        1.3.2
-Release:        10%{?dist}
-Epoch:          0
-Group:          Development/Libraries
-License:        BSD and MPLv1.1 and W3C
+Release:        11%{?dist}
+# Older source files are BSD licensed and newer ones are ASL licensed
+License:        BSD and ASL 2.0
 URL:            http://castor.codehaus.org
 Source0:        http://dist.codehaus.org/castor/%{version}/castor-%{version}-src.tgz
-Patch0:         castor-fix-unmappable-chars.patch
+Patch0:         %{name}-%{version}-fix-unmappable-chars.patch
 
 BuildArch:      noarch
 BuildRequires:  maven-local
@@ -29,10 +28,10 @@ BuildRequires:  javacc-maven-plugin
 BuildRequires:  castor-maven-plugin
 BuildRequires:  geronimo-jpa
 BuildRequires:  geronimo-jta
-Obsoletes:      castor-demo < 0:1.3.2
-Obsoletes:      castor-test < 0:1.3.2
-Obsoletes:      castor-xml < 0:1.3.2
-Obsoletes:      castor-doc < 0:1.3.2
+Obsoletes:      castor-demo < 1.3.2
+Obsoletes:      castor-test < 1.3.2
+Obsoletes:      castor-xml < 1.3.2
+Obsoletes:      castor-doc < 1.3.2
 
 %description
 Castor is an open source data binding framework for Java. It's basically
@@ -40,8 +39,7 @@ the shortest path between Java objects, XML documents and SQL tables.
 Castor provides Java to XML binding, Java to SQL persistence, and more.
 
 %package javadoc
-Group:          Documentation
-Summary:        Javadoc for %{name}
+Summary:        API documentation for %{name}
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -72,6 +70,12 @@ find . -name "*.class" -exec rm -f {} \;
 # Fix dep on cglib
 sed -i 's at cglib-nodep@cglib at g' pom.xml cpa/pom.xml
 
+# Fix dep on mtc
+sed -i 's at edu.umd.cs.mtc@edu.umd.cs at g' pom.xml xml/pom.xml
+
+# Fix dep on ant
+sed -i 's at groupId>ant<@groupId>org.apache.ant<@g' pom.xml xml/pom.xml
+
 %build
 %mvn_build -- -Dgpg.skip=true -Dmaven.test.skip=true
 
@@ -80,11 +84,15 @@ sed -i 's at cglib-nodep@cglib at g' pom.xml cpa/pom.xml
 
 %files -f .mfiles
 %doc src/doc/license.txt src/doc/new-license.txt
+%dir %{_javadir}/%{name}
 
 %files javadoc -f .mfiles-javadoc
 %doc src/doc/license.txt src/doc/new-license.txt
 
 %changelog
+* Wed Nov 27 2013 Mat Booth <fedora at matbooth.co.uk> - 0:1.3.2-11
+- Update for merge review comments and fix rawhide build
+
 * Mon Aug 12 2013 Mat Booth <fedora at matbooth.co.uk> - 0:1.3.2-10
 - Add BR on castor-maven-pluing
 - Perform non-bootstrap build