Attachment 583640 Details for Bug 820676 – enabled unbuilt modules

[patch] enabled unbuilt modules

0001-enabled-unbuilt-modules.patch (text/plain), 28.26 KB, created by gil cattaneo on 2012-05-10 16:44:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-05-10 16:44:27 UTC

Size: 28.26 KB

patch

obsolete

>From d1044343f6a1e6f0725202d588b9eb11cf2ac43c Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Thu, 10 May 2012 16:45:40 +0200
>Subject: [PATCH] enabled unbuilt modules
>
>---
> castor-1.3.2-buildfix.patch                 |  176 ++++++++++++++++++++++
> castor-1.3.2-fix-version-in-manifests.patch |  212 +++++++++++++++++++++++++++
> castor-1.3.2-maven-plugins-pom.patch        |   19 +++
> castor.spec                                 |  188 +++++++++++++++++++++++-
> 4 files changed, 588 insertions(+), 7 deletions(-)
> create mode 100644 castor-1.3.2-buildfix.patch
> create mode 100644 castor-1.3.2-fix-version-in-manifests.patch
> create mode 100644 castor-1.3.2-maven-plugins-pom.patch
>
>diff --git a/castor-1.3.2-buildfix.patch b/castor-1.3.2-buildfix.patch
>new file mode 100644
>index 0000000..49dc605
>--- /dev/null
>+++ b/castor-1.3.2-buildfix.patch
>@@ -0,0 +1,176 @@
>+diff -Nru castor-1.3.2/anttask/pom.xml castor-1.3.2-gil/anttask/pom.xml
>+--- castor-1.3.2/anttask/pom.xml	2011-03-29 11:20:30.000000000 +0200
>++++ castor-1.3.2-gil/anttask/pom.xml	2012-05-10 14:34:30.482407740 +0200
>+@@ -34,7 +34,7 @@
>+ 		</dependency>
>+ 
>+ 		<dependency>
>+-			<groupId>ant</groupId>
>++			<groupId>org.apache.ant</groupId>
>+ 			<artifactId>ant</artifactId>
>+ 			<version>1.6</version>
>+ 		</dependency>
>+diff -Nru castor-1.3.2/cpa/pom.xml castor-1.3.2-gil/cpa/pom.xml
>+--- castor-1.3.2/cpa/pom.xml	2011-03-29 11:20:38.000000000 +0200
>++++ castor-1.3.2-gil/cpa/pom.xml	2012-05-10 14:34:30.473407740 +0200
>+@@ -95,7 +95,7 @@
>+ 
>+         <dependency>
>+             <groupId>cglib</groupId>
>+-            <artifactId>cglib-nodep</artifactId>
>++            <artifactId>cglib</artifactId>
>+         </dependency>
>+ 
>+         <dependency>
>+diff -Nru castor-1.3.2/pom.xml castor-1.3.2-gil/pom.xml
>+--- castor-1.3.2/pom.xml	2011-03-29 11:20:29.000000000 +0200
>++++ castor-1.3.2-gil/pom.xml	2012-05-10 14:53:32.816385159 +0200
>+@@ -30,8 +30,8 @@
>+         
>+ 
>+ 		
>+-        <module>cpactf</module>
>+-        <module>jpa-extensions-it</module>
>++        
>++        
>+ 
>+         <module>xmlctf</module>
>+ 
>+@@ -373,7 +373,7 @@
>+             </dependency>
>+     
>+             <dependency>
>+-                <groupId>ant</groupId>
>++                <groupId>org.apache.ant</groupId>
>+                 <artifactId>ant</artifactId>
>+                 <version>1.6.5</version>
>+                 
>+             </dependency>
>+ 
>+-            <dependency>
>++            
>+ 
>+             <dependency>
>+             	<groupId>org.springframework</groupId>
>+@@ -402,12 +402,12 @@
>+             	<scope>test</scope>
>+             </dependency>
>+             
>+-            <dependency>
>++            
>+             
>+             <dependency>
>+                 <groupId>junit</groupId>
>+@@ -524,7 +524,7 @@
>+             
>+             <dependency>
>+                 <groupId>cglib</groupId>
>+-                <artifactId>cglib-nodep</artifactId>
>++                <artifactId>cglib</artifactId>
>+                 <version>2.2</version>
>+             </dependency>
>+     
>+@@ -534,11 +534,11 @@
>+                 <version>1.1</version>
>+             </dependency>
>+ 
>+-            <dependency>
>++            
>+ 
>+             <dependency>
>+                 <groupId>postgresql</groupId>
>+@@ -546,7 +546,7 @@
>+                 <version>8.3-603.jdbc3</version>
>+             </dependency> 
>+ 
>+-            <dependency>
>++            
>+ 
>+                         
>+             <dependency>
>+@@ -589,11 +589,11 @@
>+                 <version>${project.version}</version>
>+             </dependency>
>+ 
>+-            <dependency>
>++            
>+ 
>+             <dependency>
>+                 <groupId>org.codehaus.castor</groupId>
>+@@ -758,8 +758,8 @@
>+         <profile>
>+             <id>it</id>
>+             <modules>
>+-               <module>cpactf</module>
>+-               <module>jpa-extensions-it</module>
>++               
>++               
>+                <module>xmlctf</module>
>+             </modules>            
>+         </profile>
>+@@ -776,7 +776,7 @@
>+         <profile>
>+             <id>cpatests</id>
>+             <modules>
>+-                <module>cpactf</module>
>++                
>+             </modules>            
>+         </profile>
>+         
>+diff -Nru castor-1.3.2/xml/pom.xml castor-1.3.2-gil/xml/pom.xml
>+--- castor-1.3.2/xml/pom.xml	2011-03-29 11:20:42.000000000 +0200
>++++ castor-1.3.2-gil/xml/pom.xml	2012-05-10 14:34:30.475407740 +0200
>+@@ -117,7 +117,7 @@
>+ 
>+         
>+         <dependency>
>+-            <groupId>ant</groupId>
>++            <groupId>org.apache.ant</groupId>
>+             <artifactId>ant</artifactId>
>+             <scope>test</scope>
>+         </dependency>
>+diff -Nru castor-1.3.2/xmlctf-framework/pom.xml castor-1.3.2-gil/xmlctf-framework/pom.xml
>+--- castor-1.3.2/xmlctf-framework/pom.xml	2011-03-29 11:20:57.000000000 +0200
>++++ castor-1.3.2-gil/xmlctf-framework/pom.xml	2012-05-10 14:34:30.474407740 +0200
>+@@ -66,7 +66,7 @@
>+         </dependency>
>+ 
>+         <dependency>
>+-            <groupId>ant</groupId>
>++            <groupId>org.apache.ant</groupId>
>+             <artifactId>ant</artifactId>
>+         </dependency>
>+ 
>diff --git a/castor-1.3.2-fix-version-in-manifests.patch b/castor-1.3.2-fix-version-in-manifests.patch
>new file mode 100644
>index 0000000..76a8d64
>--- /dev/null
>+++ b/castor-1.3.2-fix-version-in-manifests.patch
>@@ -0,0 +1,212 @@
>+diff -Nru castor-1.3.2/anttask/src/main/resources/META-INF/MANIFEST.MF castor-1.3.2-gil/anttask/src/main/resources/META-INF/MANIFEST.MF
>+--- castor-1.3.2/anttask/src/main/resources/META-INF/MANIFEST.MF	2011-03-29 11:20:30.000000000 +0200
>++++ castor-1.3.2-gil/anttask/src/main/resources/META-INF/MANIFEST.MF	2012-05-10 16:01:21.412304734 +0200
>+@@ -1,8 +1,8 @@
>+ Manifest-Version: 1.0
>+ Specification-Title: Castor XML code generator - ant task 
>+ Specification-Vendor: Intalio Inc.
>+-Specification-Version: $VERSION$$RELEASE$
>++Specification-Version: $VERSION
>+ Implementation-Title: Castor
>+ Implementation-Vendor: Intalio Inc.
>+-Implementation-Version: $VERSION$$RELEASE$
>++Implementation-Version: $VERSION
>+ Sealed: true
>+diff -Nru castor-1.3.2/codegen/src/main/resources/META-INF/MANIFEST.MF castor-1.3.2-gil/codegen/src/main/resources/META-INF/MANIFEST.MF
>+--- castor-1.3.2/codegen/src/main/resources/META-INF/MANIFEST.MF	2011-03-29 11:20:31.000000000 +0200
>++++ castor-1.3.2-gil/codegen/src/main/resources/META-INF/MANIFEST.MF	2012-05-10 16:01:45.894304249 +0200
>+@@ -1,8 +1,8 @@
>+ Manifest-Version: 1.0
>+ Specification-Title: Castor JDO
>+ Specification-Vendor: Intalio Inc.
>+-Specification-Version: $VERSION$$RELEASE$
>++Specification-Version: $VERSION
>+ Implementation-Title: Castor
>+ Implementation-Vendor: Intalio Inc.
>+-Implementation-Version: $VERSION$$RELEASE$
>++Implementation-Version: $VERSION
>+ Sealed: true
>+diff -Nru castor-1.3.2/codegen-testcase-archetype/src/main/resources/META-INF/MANIFEST.MF castor-1.3.2-gil/codegen-testcase-archetype/src/main/resources/META-INF/MANIFEST.MF
>+--- castor-1.3.2/codegen-testcase-archetype/src/main/resources/META-INF/MANIFEST.MF	2011-03-29 11:21:15.000000000 +0200
>++++ castor-1.3.2-gil/codegen-testcase-archetype/src/main/resources/META-INF/MANIFEST.MF	2012-05-10 16:02:07.404303825 +0200
>+@@ -1,8 +1,8 @@
>+ Manifest-Version: 1.0
>+ Specification-Title: Castor XML
>+ Specification-Vendor: Intalio Inc.
>+-Specification-Version: $VERSION$$RELEASE$
>++Specification-Version: $VERSION
>+ Implementation-Title: Castor
>+ Implementation-Vendor: Intalio Inc.
>+-Implementation-Version: $VERSION$$RELEASE$
>++Implementation-Version: $VERSION
>+ Sealed: true
>+diff -Nru castor-1.3.2/core/src/main/resources/META-INF/MANIFEST.MF castor-1.3.2-gil/core/src/main/resources/META-INF/MANIFEST.MF
>+--- castor-1.3.2/core/src/main/resources/META-INF/MANIFEST.MF	2011-03-29 11:20:59.000000000 +0200
>++++ castor-1.3.2-gil/core/src/main/resources/META-INF/MANIFEST.MF	2012-05-10 16:02:25.742303463 +0200
>+@@ -1,8 +1,8 @@
>+ Manifest-Version: 1.0
>+ Specification-Title: Castor Core
>+ Specification-Vendor: Intalio Inc.
>+-Specification-Version: $VERSION$$RELEASE$
>++Specification-Version: $VERSION
>+ Implementation-Title: Castor
>+ Implementation-Vendor: Intalio Inc.
>+-Implementation-Version: $VERSION$$RELEASE$
>++Implementation-Version: $VERSION
>+ Sealed: true
>+diff -Nru castor-1.3.2/cpa/src/main/resources/META-INF/MANIFEST.MF castor-1.3.2-gil/cpa/src/main/resources/META-INF/MANIFEST.MF
>+--- castor-1.3.2/cpa/src/main/resources/META-INF/MANIFEST.MF	2011-03-29 11:20:38.000000000 +0200
>++++ castor-1.3.2-gil/cpa/src/main/resources/META-INF/MANIFEST.MF	2012-05-10 16:02:45.190303077 +0200
>+@@ -1,10 +1,10 @@
>+ Manifest-Version: 1.0
>+ Specification-Title: Castor CPA
>+ Specification-Vendor: Intalio Inc.
>+-Specification-Version: $VERSION$$RELEASE$
>++Specification-Version: $VERSION
>+ Implementation-Title: Castor
>+ Implementation-Vendor: Intalio Inc.
>+-Implementation-Version: $VERSION$$RELEASE$
>++Implementation-Version: $VERSION
>+ 
>+ 
>+ 
>+diff -Nru castor-1.3.2/cpactf/src/main/resources/META-INF/MANIFEST.MF castor-1.3.2-gil/cpactf/src/main/resources/META-INF/MANIFEST.MF
>+--- castor-1.3.2/cpactf/src/main/resources/META-INF/MANIFEST.MF	2011-03-29 11:21:15.000000000 +0200
>++++ castor-1.3.2-gil/cpactf/src/main/resources/META-INF/MANIFEST.MF	2012-05-10 16:03:29.342302205 +0200
>+@@ -1,7 +1,7 @@
>+ Manifest-Version: 1.0
>+ Specification-Title: Castor CPACTF
>+ Specification-Vendor: Intalio Inc.
>+-Specification-Version: $VERSION$$RELEASE$
>++Specification-Version: $VERSION
>+ Implementation-Title: Castor
>+ Implementation-Vendor: Intalio Inc.
>+-Implementation-Version: $VERSION$$RELEASE$
>++Implementation-Version: $VERSION
>+diff -Nru castor-1.3.2/cpa-testcase-archetype/src/main/resources/META-INF/MANIFEST.MF castor-1.3.2-gil/cpa-testcase-archetype/src/main/resources/META-INF/MANIFEST.MF
>+--- castor-1.3.2/cpa-testcase-archetype/src/main/resources/META-INF/MANIFEST.MF	2011-03-29 11:21:15.000000000 +0200
>++++ castor-1.3.2-gil/cpa-testcase-archetype/src/main/resources/META-INF/MANIFEST.MF	2012-05-10 16:03:06.054302667 +0200
>+@@ -1,8 +1,8 @@
>+ Manifest-Version: 1.0
>+ Specification-Title: Castor XML
>+ Specification-Vendor: Intalio Inc.
>+-Specification-Version: $VERSION$$RELEASE$
>++Specification-Version: $VERSION
>+ Implementation-Title: Castor
>+ Implementation-Vendor: Intalio Inc.
>+-Implementation-Version: $VERSION$$RELEASE$
>++Implementation-Version: $VERSION
>+ Sealed: true
>+diff -Nru castor-1.3.2/ddlgen/src/main/resources/META-INF/MANIFEST.MF castor-1.3.2-gil/ddlgen/src/main/resources/META-INF/MANIFEST.MF
>+--- castor-1.3.2/ddlgen/src/main/resources/META-INF/MANIFEST.MF	2011-03-29 11:20:40.000000000 +0200
>++++ castor-1.3.2-gil/ddlgen/src/main/resources/META-INF/MANIFEST.MF	2012-05-10 16:04:06.157301477 +0200
>+@@ -1,8 +1,8 @@
>+ Manifest-Version: 1.0
>+ Specification-Title: Castor DDL generator
>+ Specification-Vendor: Intalio Inc.
>+-Specification-Version: $VERSION$$RELEASE$
>++Specification-Version: $VERSION
>+ Implementation-Title: Castor
>+ Implementation-Vendor: Intalio Inc.
>+-Implementation-Version: $VERSION$$RELEASE$
>++Implementation-Version: $VERSION
>+ Sealed: true
>+diff -Nru castor-1.3.2/diff/src/main/resources/META-INF/MANIFEST.MF castor-1.3.2-gil/diff/src/main/resources/META-INF/MANIFEST.MF
>+--- castor-1.3.2/diff/src/main/resources/META-INF/MANIFEST.MF	2011-03-29 11:21:17.000000000 +0200
>++++ castor-1.3.2-gil/diff/src/main/resources/META-INF/MANIFEST.MF	2012-05-10 16:04:26.158301082 +0200
>+@@ -1,8 +1,8 @@
>+ Manifest-Version: 1.0
>+ Specification-Title: Castor XML diff
>+ Specification-Vendor: Castor
>+-Specification-Version: $VERSION$$RELEASE$
>++Specification-Version: $VERSION
>+ Implementation-Title: Castor
>+ Implementation-Vendor: Castor
>+-Implementation-Version: $VERSION$$RELEASE$
>++Implementation-Version: $VERSION
>+ Sealed: true
>+diff -Nru castor-1.3.2/jpa-extensions-it/src/main/resources/META-INF/MANIFEST.MF castor-1.3.2-gil/jpa-extensions-it/src/main/resources/META-INF/MANIFEST.MF
>+--- castor-1.3.2/jpa-extensions-it/src/main/resources/META-INF/MANIFEST.MF	2011-03-29 11:21:16.000000000 +0200
>++++ castor-1.3.2-gil/jpa-extensions-it/src/main/resources/META-INF/MANIFEST.MF	2012-05-10 16:05:07.254300269 +0200
>+@@ -1,8 +1,8 @@
>+ Manifest-Version: 1.0
>+ Specification-Title: Castor JDO Extensions
>+ Specification-Vendor: Intalio Inc.
>+-Specification-Version: $VERSION$$RELEASE$
>++Specification-Version: $VERSION
>+ Implementation-Title: Castor
>+ Implementation-Vendor: Intalio Inc.
>+-Implementation-Version: $VERSION$$RELEASE$
>++Implementation-Version: $VERSION
>+ Sealed: true
>+diff -Nru castor-1.3.2/maven-plugins/src/main/resources/META-INF/MANIFEST.MF castor-1.3.2-gil/maven-plugins/src/main/resources/META-INF/MANIFEST.MF
>+--- castor-1.3.2/maven-plugins/src/main/resources/META-INF/MANIFEST.MF	2011-03-29 11:21:15.000000000 +0200
>++++ castor-1.3.2-gil/maven-plugins/src/main/resources/META-INF/MANIFEST.MF	2012-05-10 16:05:27.134299878 +0200
>+@@ -1,8 +1,8 @@
>+ Manifest-Version: 1.0
>+ Specification-Title: Castor XML
>+ Specification-Vendor: Intalio Inc.
>+-Specification-Version: $VERSION$$RELEASE$
>++Specification-Version: $VERSION
>+ Implementation-Title: Castor
>+ Implementation-Vendor: Intalio Inc.
>+-Implementation-Version: $VERSION$$RELEASE$
>++Implementation-Version: $VERSION
>+ Sealed: true
>+diff -Nru castor-1.3.2/schema/src/main/resources/META-INF/MANIFEST.MF castor-1.3.2-gil/schema/src/main/resources/META-INF/MANIFEST.MF
>+--- castor-1.3.2/schema/src/main/resources/META-INF/MANIFEST.MF	2011-03-29 11:20:58.000000000 +0200
>++++ castor-1.3.2-gil/schema/src/main/resources/META-INF/MANIFEST.MF	2012-05-10 16:05:52.038299386 +0200
>+@@ -1,8 +1,8 @@
>+ Manifest-Version: 1.0
>+ Specification-Title: Castor XML schema
>+ Specification-Vendor: Intalio Inc.
>+-Specification-Version: $VERSION$$RELEASE$
>++Specification-Version: $VERSION
>+ Implementation-Title: Castor
>+ Implementation-Vendor: Intalio Inc.
>+-Implementation-Version: $VERSION$$RELEASE$
>++Implementation-Version: $VERSION
>+ Sealed: true
>+diff -Nru castor-1.3.2/xml/src/main/resources/META-INF/MANIFEST.MF castor-1.3.2-gil/xml/src/main/resources/META-INF/MANIFEST.MF
>+--- castor-1.3.2/xml/src/main/resources/META-INF/MANIFEST.MF	2011-03-29 11:20:42.000000000 +0200
>++++ castor-1.3.2-gil/xml/src/main/resources/META-INF/MANIFEST.MF	2012-05-10 16:06:19.359298846 +0200
>+@@ -1,8 +1,8 @@
>+ Manifest-Version: 1.0
>+ Specification-Title: Castor XML
>+ Specification-Vendor: Intalio Inc.
>+-Specification-Version: $VERSION$$RELEASE$
>++Specification-Version: $VERSION
>+ Implementation-Title: Castor
>+ Implementation-Vendor: Intalio Inc.
>+-Implementation-Version: $VERSION$$RELEASE$
>++Implementation-Version: $VERSION
>+ Sealed: true
>+diff -Nru castor-1.3.2/xmlctf/src/main/resources/META-INF/MANIFEST.MF castor-1.3.2-gil/xmlctf/src/main/resources/META-INF/MANIFEST.MF
>+--- castor-1.3.2/xmlctf/src/main/resources/META-INF/MANIFEST.MF	2011-03-29 11:20:56.000000000 +0200
>++++ castor-1.3.2-gil/xmlctf/src/main/resources/META-INF/MANIFEST.MF	2012-05-10 16:06:38.103298473 +0200
>+@@ -1,10 +1,10 @@
>+ Manifest-Version: 1.0
>+ Specification-Title: Castor XML - Integration tests
>+ Specification-Vendor: Intalio Inc.
>+-Specification-Version: $VERSION$$RELEASE$
>++Specification-Version: $VERSION
>+ Implementation-Title: Castor
>+ Implementation-Vendor: Intalio Inc.
>+-Implementation-Version: $VERSION$$RELEASE$
>++Implementation-Version: $VERSION
>+ 
>+ 
>+ 
>+diff -Nru castor-1.3.2/xmlctf-framework/src/main/resources/META-INF/MANIFEST.MF castor-1.3.2-gil/xmlctf-framework/src/main/resources/META-INF/MANIFEST.MF
>+--- castor-1.3.2/xmlctf-framework/src/main/resources/META-INF/MANIFEST.MF	2011-03-29 11:20:57.000000000 +0200
>++++ castor-1.3.2-gil/xmlctf-framework/src/main/resources/META-INF/MANIFEST.MF	2012-05-10 16:06:57.287298096 +0200
>+@@ -1,7 +1,7 @@
>+ Manifest-Version: 1.0
>+ Specification-Title: Castor XMLCTF
>+ Specification-Vendor: Intalio Inc.
>+-Specification-Version: $VERSION$$RELEASE$
>++Specification-Version: $VERSION
>+ Implementation-Title: Castor
>+ Implementation-Vendor: Intalio Inc.
>+-Implementation-Version: $VERSION$$RELEASE$
>++Implementation-Version: $VERSION
>diff --git a/castor-1.3.2-maven-plugins-pom.patch b/castor-1.3.2-maven-plugins-pom.patch
>new file mode 100644
>index 0000000..8c73de8
>--- /dev/null
>+++ b/castor-1.3.2-maven-plugins-pom.patch
>@@ -0,0 +1,19 @@
>+--- maven-plugins/pom.xml	2012-05-10 13:39:05.703473462 +0200
>++++ maven-plugins/pom.xml-gil	2012-05-10 13:47:03.565464016 +0200
>+@@ -45,6 +45,16 @@
>+          <version>2.0.1</version>
>+       </dependency>
>+       <dependency>
>++         <groupId>org.apache.maven</groupId>
>++         <artifactId>maven-artifact</artifactId>
>++         <version>3.0.3</version>
>++      </dependency>
>++      <dependency>
>++         <groupId>org.apache.maven</groupId>
>++         <artifactId>maven-core</artifactId>
>++         <version>3.0.3</version>
>++      </dependency>
>++      <dependency>
>+          <groupId>org.codehaus.castor</groupId>
>+          <artifactId>castor-testsuite-xml-framework</artifactId>
>+       </dependency>
>diff --git a/castor.spec b/castor.spec
>index 92ad9e1..dd43bb5 100644
>--- a/castor.spec
>+++ b/castor.spec
>@@ -1,19 +1,80 @@
>+%global with_bootstrap 1
> Summary:        An open source data binding framework for Java
> Name:           castor
> Version:        1.3.2
>-Release:        2%{?dist}
>+Release:        3%{?dist}
> Epoch:          0
> Group:          Development/Libraries
> License:        BSD and MPLv1.1 and W3C
> URL:            http://castor.codehaus.org
>-Source0:        http://dist.codehaus.org/castor/1.3.2/castor-1.3.2-src.tgz
>-Patch0:         disable-modules.patch
>+Source0:        http://dist.codehaus.org/castor/%{version}/castor-%{version}-src.tgz
>+%if %{with_bootstrap}
>+Source1:        http://repo1.maven.org/maven2/org/codehaus/mojo/castor-maven-plugin/2.1/castor-maven-plugin-2.1.jar
>+Source2:        http://repo1.maven.org/maven2/org/codehaus/mojo/castor-maven-plugin/2.1/castor-maven-plugin-2.1.pom
>+Source3:        http://repo1.maven.org/maven2/org/codehaus/castor/castor-codegen/1.3.1/castor-codegen-1.3.1.jar
>+Source4:        http://repo1.maven.org/maven2/org/codehaus/castor/castor-codegen/1.3.1/castor-codegen-1.3.1.pom
>+Source5:        http://repo1.maven.org/maven2/org/codehaus/castor/castor-xml-schema/1.3.1/castor-xml-schema-1.3.1.jar
>+Source6:        http://repo1.maven.org/maven2/org/codehaus/castor/castor-xml-schema/1.3.1/castor-xml-schema-1.3.1.pom
>+Source7:        http://repo1.maven.org/maven2/org/codehaus/castor/castor-xml/%{version}/castor-xml-%{version}.jar
>+#Source8:        http://repo1.maven.org/maven2/org/codehaus/castor/castor-xml/1.3.2/castor-xml-1.3.2.pom
>+%endif
>+#Patch0:         disable-modules.patch
>+# remove 
>+#    wagon-webdav
>+#    dbunit
>+#    mockejb
>+#    org.codehaus.castor spring-orm
>+#    org.springframework spring-test
>+#    tyrex
>+# disable module(s)
>+#    cpactf require tyrex tyrex 1.0.1
>+#    jpa-extensions-it require org.codehaus.castor spring-orm 2.1
>+# fix ant gId
>+# change aId cglib-nodep in cglib
>+Patch1:         castor-1.3.2-buildfix.patch
>+# add maven 3 apis
>+Patch2:         castor-1.3.2-maven-plugins-pom.patch
>+Patch3:         castor-1.3.2-fix-version-in-manifests.patch
>+
> BuildArch:      noarch
>+BuildRequires:  ant
>+BuildRequires:  apache-commons-cli
>+BuildRequires:  apache-commons-dbcp
>+BuildRequires:  apache-commons-io
>+BuildRequires:  apache-commons-lang
>+BuildRequires:  apache-commons-logging
>+BuildRequires:  bea-stax
>+BuildRequires:  cglib
>+BuildRequires:  dos2unix
>+BuildRequires:  geronimo-jta
>+BuildRequires:  hibernate-jpa-2.0-api
>+BuildRequires:  jakarta-oro
>+BuildRequires:  junit
>+BuildRequires:  ldapjdk >= 0:4.18-10
>+BuildRequires:  regexp
>+BuildRequires:  velocity
>+
> BuildRequires:  maven
> BuildRequires:  codehaus-parent
>+BuildRequires:  javacc-maven-plugin
> BuildRequires:  maven-enforcer-plugin
>+%if !%{with_bootstrap}
>+BuildRequires:  castor-maven-plugin
>+%endif
>+
>+Requires:       ant
>+Requires:       apache-commons-cli
> Requires:       apache-commons-logging
> Requires:       apache-commons-lang
>+Requires:       bea-stax
>+Requires:       cglib
>+Requires:       geronimo-jta
>+Requires:       hibernate-jpa-2.0-api
>+Requires:       jakarta-oro
>+Requires:       junit
>+Requires:       ldapjdk >= 0:4.18-10
>+Requires:       velocity
>+
> Obsoletes:      castor-demo < 0:1.3.2
> Obsoletes:      castor-test < 0:1.3.2
> Obsoletes:      castor-xml < 0:1.3.2
>@@ -31,21 +92,105 @@ Summary:        Javadoc for %{name}
> %description javadoc
> Javadoc for %{name}.
> 
>+%package maven-plugins
>+Group:          Development/Libraries
>+Summary:        Castor XML - Maven Mojos for executing XMLCTF tests
>+Requires:       maven
>+Requires:       %{name} = %{epoch}:%{version}-%{release}
>+
>+%description maven-plugins
>+Castor XML - Maven Mojos for executing XMLCTF tests.
>+
> %prep
> %setup -q
> find . -name "*.jar" -exec rm -f {} \;
> find . -name "*.class" -exec rm -f {} \;
>-%patch0 -b .sav
>-
>+#%patch0 -b .sav
> sed -i 's/Class-Path: xerces.jar jdbc-se2.0.jar jndi.jar jta1.0.1.jar//' src/etc/MANIFEST.MF
> 
>+%patch1 -p1
>+%patch2 -p0
>+%patch3 -p1
>+for i in `find . -iname "MANIFEST.MF"`; do sed -i 's,$VERSION,%{version},' $i; done
>+
>+# fix the correct end of line encoding
>+find . -type f -exec dos2unix {} \;
>+
>+# fix the source files contain characters outside of the ASCII set
>+for s in ddlgen/src/main/java/org/castor/ddlgen/AbstractGenerator.java\
>+  xml/src/main/java/org/exolab/castor/types/DateTimeBase.java;do
>+  native2ascii -encoding UTF8 ${s} ${s}
>+done
>+
> %build
>+
>+%if %{with_bootstrap}
>+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
>+mkdir -p $MAVEN_REPO_LOCAL
>+mkdir -p $MAVEN_REPO_LOCAL/org/codehaus/mojo/castor-maven-plugin/2.1
>+cp -pr %{SOURCE1} $MAVEN_REPO_LOCAL/org/codehaus/mojo/castor-maven-plugin/2.1
>+cp -pr %{SOURCE2} $MAVEN_REPO_LOCAL/org/codehaus/mojo/castor-maven-plugin/2.1
>+mkdir -p $MAVEN_REPO_LOCAL/org/codehaus/castor/castor-codegen/1.3.1
>+cp -pr %{SOURCE3} $MAVEN_REPO_LOCAL/org/codehaus/castor/castor-codegen/1.3.1
>+cp -pr %{SOURCE4} $MAVEN_REPO_LOCAL/org/codehaus/castor/castor-codegen/1.3.1
>+mkdir -p $MAVEN_REPO_LOCAL/org/codehaus/castor/castor-xml-schema/1.3.1
>+cp -pr %{SOURCE5} $MAVEN_REPO_LOCAL/org/codehaus/castor/castor-xml-schema/1.3.1
>+cp -pr %{SOURCE6} $MAVEN_REPO_LOCAL/org/codehaus/castor/castor-xml-schema/1.3.1
>+mkdir -p $MAVEN_REPO_LOCAL/org/codehaus/castor/castor-xml/%{version}
>+cp -pr %{SOURCE7} $MAVEN_REPO_LOCAL/org/codehaus/castor/castor-xml/%{version}
>+cp -pr xml/pom.xml $MAVEN_REPO_LOCAL/org/codehaus/castor/castor-xml/%{version}/castor-xml-%{version}.pom
>+mvn-rpmbuild -Dgpg.skip=true -Dmaven.test.skip=true -Dmaven.repo.local=$MAVEN_REPO_LOCAL compile
>+mvn-rpmbuild -Dgpg.skip=true -Dmaven.test.skip=true -Dmaven.repo.local=$MAVEN_REPO_LOCAL install 
>+mvn-rpmbuild -Dgpg.skip=true -Dmaven.test.skip=true -Dmaven.repo.local=$MAVEN_REPO_LOCAL javadoc:aggregate
>+%else
> mvn-rpmbuild -Dgpg.skip=true -Dmaven.test.skip=true install javadoc:aggregate
>+%endif
> 
> %install
>-# jar
>+
>+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
>+install -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
>+%add_maven_depmap JPP-%{name}.pom
>+
> install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
>-install -m 644 core/target/%{name}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
>+#  TODO cpactf
>+for m in codegen \
>+  core \
>+  ddlgen \
>+  xml; do
>+
>+  install -m 644 $m/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-$m.pom
>+  install -m 644 $m/target/%{name}-$m-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-$m.jar
>+  %add_maven_depmap JPP-%{name}-$m.pom %{name}-$m.jar
>+done
>+# backward compatibility
>+(
>+  cd $RPM_BUILD_ROOT%{_javadir}
>+  ln -sf %{name}-core.jar %{name}.jar
>+)
>+
>+install -m 644 anttask/target/%{name}-anttasks-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-anttasks.jar
>+install -m 644 cpa/target/%{name}-jdo-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-jdo.jar
>+install -m 644 diff/target/%{name}-xml-diff-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-xml-diff.jar
>+install -m 644 schema/target/%{name}-xml-schema-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-xml-schema.jar
>+install -m 644 xmlctf-framework/target/%{name}-testsuite-xml-framework-%{version}.jar \
>+  $RPM_BUILD_ROOT%{_javadir}/%{name}-testsuite-xml-framework.jar
>+
>+install -m 644 maven-plugins/target/%{name}-maven-plugins-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-maven-plugins.jar
>+
>+install -m 644 anttask/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-anttasks.pom
>+%add_maven_depmap JPP-%{name}-anttasks.pom %{name}-anttasks.jar
>+install -m 644 cpa/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-jdo.pom
>+%add_maven_depmap JPP-%{name}-jdo.pom %{name}-jdo.jar
>+install -m 644 diff/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-xml-diff.pom
>+%add_maven_depmap JPP-%{name}-xml-diff.pom %{name}-xml-diff.jar
>+install -m 644 schema/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-xml-schema.pom
>+%add_maven_depmap JPP-%{name}-xml-schema.pom %{name}-xml-schema.jar
>+install -m 644 xmlctf-framework/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-testsuite-xml-framework.pom
>+%add_maven_depmap JPP-%{name}-testsuite-xml-framework.pom %{name}-testsuite-xml-framework.jar
>+
>+install -m 644 maven-plugins/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-maven-plugins.pom
>+%add_maven_depmap -f maven-plugins JPP-%{name}-maven-plugins.pom %{name}-maven-plugins.jar
> 
> # javadoc
> install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>@@ -53,11 +198,40 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> 
> %files
> %{_javadir}/%{name}.jar
>+%{_javadir}/%{name}-anttasks.jar
>+%{_javadir}/%{name}-codegen.jar
>+%{_javadir}/%{name}-core.jar
>+%{_javadir}/%{name}-ddlgen.jar
>+%{_javadir}/%{name}-jdo.jar
>+%{_javadir}/%{name}-testsuite-xml-framework.jar
>+%{_javadir}/%{name}-xml-diff.jar
>+%{_javadir}/%{name}-xml-schema.jar
>+%{_javadir}/%{name}-xml.jar
>+%{_mavenpomdir}/JPP-%{name}.pom
>+%{_mavenpomdir}/JPP-%{name}-anttasks.pom
>+%{_mavenpomdir}/JPP-%{name}-codegen.pom
>+%{_mavenpomdir}/JPP-%{name}-core.pom
>+%{_mavenpomdir}/JPP-%{name}-ddlgen.pom
>+%{_mavenpomdir}/JPP-%{name}-jdo.pom
>+%{_mavenpomdir}/JPP-%{name}-testsuite-xml-framework.pom
>+%{_mavenpomdir}/JPP-%{name}-xml-diff.pom
>+%{_mavenpomdir}/JPP-%{name}-xml-schema.pom
>+%{_mavenpomdir}/JPP-%{name}-xml.pom
>+%{_mavendepmapfragdir}/%{name}
> 
> %files javadoc
> %{_javadocdir}/%{name}
> 
>+%files maven-plugins
>+%{_javadir}/%{name}-maven-plugins.jar
>+%{_mavenpomdir}/JPP-%{name}-maven-plugins.pom
>+%{_mavendepmapfragdir}/%{name}-maven-plugins
>+
> %changelog
>+* Wed May 09 2012 gil cattaneo <puntogil@libero.it> 0:1.3.2-3
>+- enabled unbuilt modules (exception for cpactf)
>+- bootstrap mode
>+
> * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.3.2-2
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 820676: 583631 | 583640 | 590620