commit d4df393c490116bb43cf9627f611c6f97de4adc5 Author: gil puntogil@libero.it Date: Tue Jul 2 16:03:38 2013 +0200
build with XMvn
.gitignore | 1 + shrinkwrap.spec | 81 ++++++++++++++++-------------------------------------- sources | 2 +- 3 files changed, 26 insertions(+), 58 deletions(-) --- diff --git a/.gitignore b/.gitignore index 79902d9..31c5668 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /shrinkwrap-1.0.0.tar.xz /shrinkwrap-1.1.2.tar.xz +/1.1.2.tar.gz diff --git a/shrinkwrap.spec b/shrinkwrap.spec index 4e0542d..80dca55 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -2,42 +2,31 @@ %global namedversion %{version}%{?namedreltag} Name: shrinkwrap Version: 1.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simple mechanism to assemble Java archives -Group: Development/Libraries License: ASL 2.0 Url: http://www.jboss.org/shrinkwrap/ -# git clone git://github.com/shrinkwrap/shrinkwrap.git shrinkwrap-1.1.2 -# (cd shrinkwrap-1.1.2 && git archive --format=tar --prefix=shrinkwrap-1.1.2/ 1.1.2 | xz > ../shrinkwrap-1.1.2.tar.xz) -Source0: %{name}-%{namedversion}.tar.xz +Source0: https://github.com/shrinkwrap/shrinkwrap/archive/%%7Bnamedversion%7D.tar.gz # remove env.JAVA"x"_HOME # malformed pom file, not able to use pom macros Patch0: %{name}-%{namedversion}-remove-enforcer-requireProperty.patch
BuildRequires: java-devel -BuildRequires: jboss-parent +BuildRequires: mvn(org.jboss:jboss-parent)
-BuildRequires: apiviz -BuildRequires: junit +BuildRequires: mvn(org.jboss.apiviz:apiviz) +BuildRequires: mvn(junit:junit)
BuildRequires: maven-local BuildRequires: maven-checkstyle-plugin -BuildRequires: maven-compiler-plugin BuildRequires: maven-enforcer-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-resources-plugin BuildRequires: maven-source-plugin -BuildRequires: maven-surefire-plugin BuildRequires: maven-surefire-provider-junit4
# required by enforcer-plugin BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) BuildRequires: mvn(org.apache.maven.shared:maven-shared-components)
-Requires: junit - -Requires: java BuildArch: noarch
%description @@ -45,7 +34,6 @@ Shrinkwrap provides a simple mechanism to assemble archives like JARs, WARs, and EARs with a friendly, fluent API.
%package javadoc -Group: Documentation Summary: Javadoc for %{name}
%description javadoc @@ -66,58 +54,37 @@ This package contains javadoc for %{name}.
sed -i 's/\r//' LICENSE
+%mvn_file :%{name}-api %{name}/api +%mvn_file :%{name}-api-nio2 %{name}/api-nio2 +%mvn_file :%{name}-build-resources %{name}/build-resources +%mvn_file :%{name}-impl-base %{name}/impl-base +%mvn_file :%{name}-impl-nio2 %{name}/impl-nio2 +%mvn_file :%{name}-spi %{name}/spi + %build
-mvn-rpmbuild package javadoc:aggregate +%mvn_build
%install +%mvn_install
-mkdir -p %{buildroot}%{_javadir}/%{name} install -pm 644 api/target/%{name}-api-%{namedversion}-tests.jar %{buildroot}%{_javadir}/%{name}/api-tests.jar -install -pm 644 api/target/%{name}-api-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/api.jar -install -pm 644 api-nio2/target/%{name}-api-nio2-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/api-nio2.jar -install -pm 644 build-resources/target/%{name}-build-resources-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/build-resources.jar install -pm 644 impl-base/target/%{name}-impl-base-%{namedversion}-tests.jar %{buildroot}%{_javadir}/%{name}/impl-base-tests.jar -install -pm 644 impl-base/target/%{name}-impl-base-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/impl-base.jar -install -pm 644 impl-nio2/target/%{name}-impl-nio2-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/impl-nio2.jar -install -pm 644 spi/target/%{name}-spi-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/spi.jar - -mkdir -p %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-parent.pom -%add_maven_depmap JPP.%{name}-parent.pom -install -pm 644 bom/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-bom.pom -%add_maven_depmap JPP.%{name}-bom.pom -install -pm 644 depchain/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-depchain.pom -%add_maven_depmap JPP.%{name}-depchain.pom -install -pm 644 depchain-java7/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-depchain-java7.pom -%add_maven_depmap JPP.%{name}-depchain-java7.pom -install -pm 644 api/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-api.pom -%add_maven_depmap JPP.%{name}-api.pom %{name}/api.jar -install -pm 644 api-nio2/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-api-nio2.pom -%add_maven_depmap JPP.%{name}-api-nio2.pom %{name}/api-nio2.jar -install -pm 644 build-resources/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-build-resources.pom -%add_maven_depmap JPP.%{name}-build-resources.pom %{name}/build-resources.jar -install -pm 644 impl-base/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-impl-base.pom -%add_maven_depmap JPP.%{name}-impl-base.pom %{name}/impl-base.jar -install -pm 644 impl-nio2/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-impl-nio2.pom -%add_maven_depmap JPP.%{name}-impl-nio2.pom %{name}/impl-nio2.jar -install -pm 644 spi/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-spi.pom -%add_maven_depmap JPP.%{name}-spi.pom %{name}/spi.jar - -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -r target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} - -%files -%{_javadir}/%{name}/*.jar -%{_mavenpomdir}/JPP.%{name}-*.pom -%{_mavendepmapfragdir}/%{name} + +%files -f .mfiles +%dir %{_javadir}/%{name} +%{_javadir}/%{name}/api-tests.jar +%{_javadir}/%{name}/impl-base-tests.jar %doc LICENSE
-%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %doc LICENSE
%changelog +* Tue Jul 02 2013 gil cattaneo puntogil@libero.it 1.1.2-2 +- build with XMvn +- minor changes to adapt to current guideline + * Tue May 07 2013 gil cattaneo puntogil@libero.it 1.1.2-1 - update to 1.1.2
diff --git a/sources b/sources index 330168e..44e4246 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ab222f83a8445ceaca182cd55079cc5 shrinkwrap-1.1.2.tar.xz +a967b3ee4aa6d61724f608944e425604 1.1.2.tar.gz