[cargo-resources] update to 1.4.2

[gil]

commit 5a0c182b84a90878a83dd534c814ebf6e105ebb6
Author: gil <puntogil at libero.it>
Date:   Wed Jun 5 08:25:46 2013 +0200

    update to 1.4.2

 .gitignore           |    1 +
 cargo-resources.spec |   26 +++++++++-----------------
 sources              |    2 +-
 3 files changed, 11 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bee72c2..5332188 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /cargo-resources-1.2.4-src-svn.tar.gz
 /cargo-resources-1.3.1-src-svn.tar.gz
+/cargo-resources-1.4.2-src-svn.tar.gz
diff --git a/cargo-resources.spec b/cargo-resources.spec
index 6c840f8..6fd7559 100644
--- a/cargo-resources.spec
+++ b/cargo-resources.spec
@@ -1,20 +1,17 @@
 %global oname cargo
 Name:          cargo-resources
-Version:       1.3.1
-Release:       4%{?dist}
+Version:       1.4.2
+Release:       1%{?dist}
 Summary:       Cargo Shared Resources
 Group:         Development/Libraries
 License:       ASL 2.0
 Url:           http://cargo.codehaus.org/
-# svn export http://svn.codehaus.org/cargo/resources/tags/cargo-resources-1.2.4
-# tar czf cargo-resources-1.2.4-src-svn.tar.gz cargo-resources-1.2.4
+# svn export http://svn.codehaus.org/cargo/resources/tags/cargo-resources-1.4.2
+# tar czf cargo-resources-1.4.2-src-svn.tar.gz cargo-resources-1.4.2
 Source0:       %{name}-%{version}-src-svn.tar.gz
-# force tomcat 7.x apis use
-Source1:       %{name}-1.2.2-depmap
 
 BuildRequires: cargo-parent
 BuildRequires: java-devel
-BuildRequires: jpackage-utils
 
 BuildRequires: felix-osgi-core
 BuildRequires: geronimo-ejb
@@ -24,16 +21,10 @@ BuildRequires: javamail
 BuildRequires: tomcat-servlet-3.0-api
 
 BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
 BuildRequires: maven-ear-plugin
 BuildRequires: maven-ejb-plugin
 BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-plugin-bundle
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
 BuildRequires: maven-war-plugin
 
 Requires:      felix-osgi-core
@@ -42,7 +33,6 @@ Requires:      javamail
 Requires:      tomcat-servlet-3.0-api
 
 Requires:      java
-Requires:      jpackage-utils
 BuildArch:     noarch
 
 %description
@@ -51,7 +41,6 @@ Cargo Shared Resources (License files, Checkstyle configuration files, etc).
 %package javadoc
 Group:         Documentation
 Summary:       Javadoc for %{name}
-Requires:      jpackage-utils
 
 %description javadoc
 This package contains javadoc for %{name}.
@@ -73,8 +62,8 @@ sed -i "s|<version>4.0.0</version>|<version>1.4.0</version>|" testdata/simple-bu
 sed -i "s|<artifactId>geronimo-j2ee_1.4_spec|<artifactId>geronimo-ejb_3.1_spec|" testdata/simple-ejb/pom.xml
 
 %build
-
-mvn-rpmbuild -Dmaven.local.depmap.file="%{SOURCE1}" install javadoc:aggregate
+# force tomcat 7.x apis use
+mvn-rpmbuild -Dmaven.local.depmap.file="%{_mavendepmapfragdir}/tomcat-tomcat-servlet-api" package javadoc:aggregate
 
 %install
 
@@ -148,6 +137,9 @@ cp -p build-tools/NOTICE .
 %doc LICENSE NOTICE
 
 %changelog
+* Wed Jun 05 2013 gil cattaneo <puntogil at libero.it> 1.4.2-1
+- Update to 1.4.2
+
 * Sun Feb 17 2013 gil cattaneo <puntogil at libero.it> 1.3.1-4
 - added missing BR geronimo-parent-poms
 
diff --git a/sources b/sources
index d7a76e4..896e785 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c604d4ab4f67d84e6d283e29d4590d77  cargo-resources-1.3.1-src-svn.tar.gz
+4abf5aede71316d27649f4ca5e2d9da6  cargo-resources-1.4.2-src-svn.tar.gz