[castor] Add BR on castor-maven-pluing

[mbooth]

commit 314cb2b1e822ad5b764135f9ed39ee04d679bf26
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Mon Aug 12 15:02:03 2013 +0100

    Add BR on castor-maven-pluing
    
    - Perform non-bootstrap build

 .gitignore  |    2 --
 castor.spec |   26 ++++++++------------------
 sources     |    1 -
 3 files changed, 8 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7754bb4..64583be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-castor-0.9.5-src.tgz
 /castor-1.3.2-src.tgz
-/bootstrap-generated-sources-1.3.2.tar.gz
diff --git a/castor.spec b/castor.spec
index 42d073f..7f2c0fd 100644
--- a/castor.spec
+++ b/castor.spec
@@ -1,19 +1,12 @@
-%global bootstrap 1
-
 Summary:        An open source data binding framework for Java
 Name:           castor
 Version:        1.3.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 Epoch:          0
 Group:          Development/Libraries
 License:        BSD and MPLv1.1 and W3C
 URL:            http://castor.codehaus.org
 Source0:        http://dist.codehaus.org/castor/%{version}/castor-%{version}-src.tgz
-
-# Bootstrap sources generated by executing "mvn generate-sources" on a
-# machine that has the castor-maven-plugin available to it
-Source1:        bootstrap-generated-sources-%{version}.tar.gz
-
 Patch0:         castor-fix-unmappable-chars.patch
 
 BuildArch:      noarch
@@ -33,6 +26,7 @@ BuildRequires:  multithreadedtc
 BuildRequires:  easymock3
 BuildRequires:  mockito
 BuildRequires:  javacc-maven-plugin
+BuildRequires:  castor-maven-plugin
 BuildRequires:  geronimo-jpa
 BuildRequires:  geronimo-jta
 Obsoletes:      castor-demo < 0:1.3.2
@@ -60,16 +54,6 @@ find . -name "*.class" -exec rm -f {} \;
 
 %patch0 -p0 -b.orig
 
-# Bootstrap with pre-generated sources to allow us to get castor-maven-plugin into fedora
-# Can be removed once castor-maven-plugin is available
-%if %bootstrap
-tar -xzf %{SOURCE1} -C .
-for module in xml schema codegen cpa ; do
-  cp -pr $module/target/generated-sources/castor/* $module/src/main/java/.
-  %pom_remove_plugin org.codehaus.mojo:castor-maven-plugin $module
-done
-%endif
-
 # Disable uneeded modules
 %pom_disable_module anttask
 %pom_disable_module xmlctf-framework
@@ -80,10 +64,12 @@ done
 %pom_disable_module jpa-extensions-it
 %pom_disable_module xmlctf
 
+# Remove test deps that are not in Fedora
 %pom_remove_dep tyrex:tyrex
 %pom_remove_dep tyrex:tyrex cpa
 %pom_xpath_remove "pom:build/pom:extensions"
 
+# Fix dep on cglib
 sed -i 's at cglib-nodep@cglib at g' pom.xml cpa/pom.xml
 
 %build
@@ -99,6 +85,10 @@ sed -i 's at cglib-nodep@cglib at g' pom.xml cpa/pom.xml
 %doc src/doc/license.txt src/doc/new-license.txt
 
 %changelog
+* 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
+
 * Fri Aug 09 2013 Mat Booth <fedora at matbooth.co.uk> - 0:1.3.2-9
 - Bootstrap XML modules with pre-generated source, this is needed to build
   castor-maven-plugin, which is needed to generate the source we are using
diff --git a/sources b/sources
index 390bb75..7813083 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-1c08e8892f85f4562fdd22692bf6559e  bootstrap-generated-sources-1.3.2.tar.gz
 3c7fd944af8bc4d72b36561e2bdcebc2  castor-1.3.2-src.tgz