[castor/f20: 5/5] Update to latest upstream 1.3.3

[Mat Booth]

commit 7b7439b67f2d2cc9b807a692a7737762d2211e6a
Author: Mat Booth <mat.booth at redhat.com>
Date:   Thu Dec 4 21:07:26 2014 +0000

    Update to latest upstream 1.3.3
    
    - Fixes rhbz#1108691 CVE-2014-3004

 .gitignore  |    5 +++++
 castor.spec |   15 ++++++++++++---
 sources     |    2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 64583be..0bd02a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
+/castor-1.*/
 /castor-1.3.2-src.tgz
+/castor-1.3.3-src.tgz
+/noarch/
+/.build-*.log
+/*.src.rpm
diff --git a/castor.spec b/castor.spec
index 86653b3..a5f35f6 100644
--- a/castor.spec
+++ b/castor.spec
@@ -1,12 +1,13 @@
 Summary:        An open source data binding framework for Java
 Name:           castor
-Version:        1.3.2
-Release:        14%{?dist}
+Version:        1.3.3
+Release:        1%{?dist}
 # Older source files are BSD licensed and newer ones are ASL licensed
 License:        BSD and ASL 2.0
 URL:            http://castor.codehaus.org
+# Hash sum of source will not match upstream because bundled jars have been removed
 Source0:        http://dist.codehaus.org/castor/%{version}/castor-%{version}-src.tgz
-Patch0:         %{name}-%{version}-fix-unmappable-chars.patch
+Patch0:         castor-1.3.2-fix-unmappable-chars.patch
 
 BuildArch:      noarch
 BuildRequires:  maven-local
@@ -28,6 +29,9 @@ BuildRequires:  javacc-maven-plugin
 BuildRequires:  castor-maven-plugin
 BuildRequires:  geronimo-jpa
 BuildRequires:  geronimo-jta
+BuildRequires:  springframework-context
+BuildRequires:  springframework-test
+BuildRequires:  xmlunit
 Obsoletes:      castor-demo < 1.3.2
 Obsoletes:      castor-test < 1.3.2
 Obsoletes:      castor-xml < 1.3.2
@@ -56,6 +60,7 @@ find . -name "*.class" -exec rm -f {} \;
 %pom_disable_module anttask
 %pom_disable_module xmlctf-framework
 %pom_disable_module maven-plugins
+%pom_disable_module xml-annotations
 
 # Disable integration test suites
 %pom_disable_module cpactf
@@ -90,6 +95,10 @@ sed -i 's at groupId>ant<@groupId>org.apache.ant<@g' pom.xml xml/pom.xml
 %doc src/doc/license.txt src/doc/new-license.txt
 
 %changelog
+* Thu Dec 04 2014 Mat Booth <mat.booth at redhat.com> - 1.3.3-1
+- Update to latest upstream 1.3.3
+- Fixes rhbz#1108691 CVE-2014-3004
+
 * Mon Jun 9 2014 Alexander Kurtakov <akurtako at redhat.com> 1.3.2-14
 - Fix FTBFS.
 
diff --git a/sources b/sources
index 7813083..de5028d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c7fd944af8bc4d72b36561e2bdcebc2  castor-1.3.2-src.tgz
+59026d491b8043c592f0cffa6830a314  castor-1.3.3-src.tgz