commit 467bab476cef435107505647f0a087313412c29b
Author: Juan Hernandez <juan.hernandez(a)redhat.com>
Date: Sat Mar 31 21:35:37 2012 +0200
Build all the modules
istack-commons-2.6.1-pom.patch | 28 -------------
istack-commons.spec | 84 +++++++++++++++++++++++++++++++--------
2 files changed, 66 insertions(+), 46 deletions(-)
---
diff --git a/istack-commons.spec b/istack-commons.spec
index aa95398..30029fb 100644
--- a/istack-commons.spec
+++ b/istack-commons.spec
@@ -1,6 +1,6 @@
Name: istack-commons
Version: 2.6.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Common code for some Glassfish projects
Group: Development/Libraries
License: CDDL and GPLv2
@@ -11,31 +11,54 @@ URL:
http://istack-commons.java.net
# find istack-commons-2.6.1/ -name '*.jar' -delete
# tar -zcvf istack-commons-2.6.1.tar.gz istack-commons-2.6.1
Source0: %{name}-%{version}.tar.gz
-Patch0: %{name}-%{version}-pom.patch
-Patch1: %{name}-%{version}-activation.patch
-
+Patch0: %{name}-%{version}-activation.patch
BuildArch: noarch
-BuildRequires: jpackage-utils
+BuildRequires: ant
+BuildRequires: ant-junit
+BuildRequires: bea-stax-api
+BuildRequires: codemodel >= 2.6-4
+BuildRequires: dom4j
BuildRequires: java-devel
+BuildRequires: jpackage-utils
+BuildRequires: jvnet-parent
+BuildRequires: junit
BuildRequires: maven
-
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-release-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-plugin-plugin
+BuildRequires: maven-release-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-shared-file-management
+BuildRequires: maven-surefire-plugin
+BuildRequires: plexus-archiver
+BuildRequires: plexus-io
Requires: jpackage-utils
Requires: java
+Requires: jvnet-parent
%description
Code shared between JAXP, JAXB, SAAJ, and JAX-WS projects.
+%package -n maven-istack-commons-plugin
+Summary: istack-commons Maven Mojo
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: codemodel >= 2.6-4
+Requires: maven-shared-file-management
+Requires: plexus-archiver
+Requires: plexus-io
+
+
+%description -n maven-istack-commons-plugin
+This package contains the istack-commons Maven Mojo.
+
+
%package javadoc
Summary: Javadocs for %{name}
Group: Documentation
@@ -49,7 +72,7 @@ This package contains the API documentation for %{name}.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
+rm -rf test/lib/*.zip
%build
@@ -66,6 +89,7 @@ mvn-rpmbuild \
%install
+
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
install -d -m 755 %{buildroot}%{_javadir}
install -d -m 755 %{buildroot}%{_mavenpomdir}
@@ -73,6 +97,9 @@ install -d -m 755 %{buildroot}%{_mavenpomdir}
# JAR
cp -p runtime/target/istack-commons-runtime-%{version}.jar
%{buildroot}%{_javadir}/%{name}-runtime.jar
cp -p tools/target/istack-commons-tools-%{version}.jar
%{buildroot}%{_javadir}/%{name}-tools.jar
+cp -p test/target/istack-commons-test-%{version}.jar
%{buildroot}%{_javadir}/%{name}-test.jar
+cp -p buildtools/target/%{name}-buildtools-%{version}.jar
%{buildroot}%{_javadir}/%{name}-buildtools.jar
+cp -p maven-plugin/target/maven-%{name}-plugin-%{version}.jar
%{buildroot}%{_javadir}/maven-%{name}-plugin.jar
# JAVADOC
cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
@@ -81,19 +108,36 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
cp -p pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
cp -p runtime/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-runtime.pom
cp -p tools/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-tools.pom
+cp -p test/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-test.pom
+cp -p buildtools/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-buildtools.pom
+cp -p maven-plugin/pom.xml %{buildroot}%{_mavenpomdir}/JPP-maven-%{name}-plugin.pom
# DEPMAP
%add_maven_depmap JPP-%{name}.pom
%add_maven_depmap JPP-%{name}-runtime.pom %{name}-runtime.jar
%add_maven_depmap JPP-%{name}-tools.pom %{name}-tools.jar
-
+%add_maven_depmap JPP-%{name}-test.pom %{name}-test.jar
+%add_maven_depmap JPP-%{name}-buildtools.pom %{name}-buildtools.jar
+%add_maven_depmap JPP-maven-%{name}-plugin.pom maven-%{name}-plugin.jar -f maven-plugin
%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
+%{_mavenpomdir}/JPP-%{name}-runtime.pom
+%{_mavenpomdir}/JPP-%{name}-test.pom
+%{_mavenpomdir}/JPP-%{name}-tools.pom
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavenpomdir}/JPP-%{name}-buildtools.pom
+%{_mavendepmapfragdir}/%{name}
+%{_javadir}/%{name}-buildtools.jar
+%{_javadir}/%{name}-runtime.jar
+%{_javadir}/%{name}-test.jar
+%{_javadir}/%{name}-tools.jar
%doc Licence.txt
+%files -n maven-istack-commons-plugin
+%{_javadir}/maven-%{name}-plugin.jar
+%{_mavenpomdir}/JPP-maven-%{name}-plugin.pom
+%{_mavendepmapfragdir}/%{name}-maven-plugin
+%doc Licence.txt
%files javadoc
%{_javadocdir}/%{name}
@@ -101,6 +145,10 @@ cp -p tools/pom.xml
%{buildroot}%{_mavenpomdir}/JPP-%{name}-tools.pom
%changelog
+* Sat Mar 31 2012 Gil Cattaneo <puntogil(a)libero.it> 2.6.1-3
+- Rebuilt with codemodel support
+- Enable maven-plugin, test and buildtools modules
+
* Mon Feb 13 2012 Juan Hernandez <juan.hernandez(a)redhat.com> 2.6.1-2
- Minor cleanups of the spec file