[seam-parent] build with XMvn
by gil
commit 6044e7e97bdeb8bc909073dfa541e8851dd3e8df
Author: gil <puntogil(a)libero.it>
Date: Tue Jul 2 18:25:51 2013 +0200
build with XMvn
.gitignore | 1 +
seam-parent.spec | 32 +++++++++++---------------------
sources | 2 +-
3 files changed, 13 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bd87350..f4791ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/seam-parent-19.tar.xz
+/19.tar.gz
diff --git a/seam-parent.spec b/seam-parent.spec
index b7b8561..e6257cd 100644
--- a/seam-parent.spec
+++ b/seam-parent.spec
@@ -1,30 +1,22 @@
Name: seam-parent
Version: 19
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: The parent for Seam modules
-Group: Development/Libraries
License: ASL 2.0
URL: http://www.seamframework.org/
-# git clone git://github.com/seam/parent.git seam-parent-19
-# (cd seam-parent-19/ && git archive --format=tar --prefix=seam-parent-19/ 19 | xz > ../seam-parent-19.tar.xz)
-Source0: %{name}-%{version}.tar.xz
+Source0: https://github.com/seam/parent/archive/%{version}.tar.gz
# seam-parent package don't include the license file
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
BuildRequires: java-devel
-BuildRequires: jpackage-utils
-
BuildRequires: maven-local
-
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
Parent for seamframework.org Projects.
%prep
-%setup -q
+%setup -q -n parent-%{version}
%pom_remove_dep junit:junit-dep
%pom_remove_dep org.jboss.arquillian.extension:arquillian-drone-bom
@@ -61,22 +53,20 @@ cp -p %{SOURCE1} .
sed -i 's/\r//' LICENSE-2.0.txt
%build
-# Nothing to do
-%install
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom
+%mvn_build
-%check
-mvn-rpmbuild verify
+%install
+%mvn_install
-%files
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
%doc LICENSE-2.0.txt
%changelog
+* Tue Jul 02 2013 gil cattaneo <puntogil(a)libero.it> 19-5
+- build with XMvn
+- minor changes to adapt to current guideline
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 19-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 86a7895..d7e3620 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-994fdeadbb4ab8f81f0366cb71173147 seam-parent-19.tar.xz
+6b6bd18ca79d48ced628aeb8b328dfbc 19.tar.gz
10 years, 10 months
[serp] build with XMvn
by gil
commit bed98b4579c2dd5519ef605d64ee244924753971
Author: gil <puntogil(a)libero.it>
Date: Tue Jul 2 18:13:24 2013 +0200
build with XMvn
serp.spec | 46 +++++++++++++---------------------------------
1 files changed, 13 insertions(+), 33 deletions(-)
---
diff --git a/serp.spec b/serp.spec
index 0f08004..a6216c7 100644
--- a/serp.spec
+++ b/serp.spec
@@ -1,8 +1,7 @@
Name: serp
Version: 1.14.2
-Release: 0.4.20120406cvs%{?dist}
+Release: 0.5.20120406cvs%{?dist}
Summary: Bytecode manipulation framework
-Group: Development/Libraries
License: BSD
Url: http://serp.sourceforge.net/
# cvs -d:pserver:anonymous@serp.cvs.sourceforge.net:/cvsroot/serp login
@@ -15,23 +14,12 @@ Source0: serp-1.14.2-20120406-src-cvs.tar.gz
Patch0: serp-1.13.1-pom_xml.patch
BuildRequires: java-devel
-BuildRequires: jpackage-utils
BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4
-BuildRequires: junit
+BuildRequires: mvn(junit:junit)
-Requires: junit
-
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -47,9 +35,7 @@ set is necessary, the framework makes it as easy as possible
to enter the world of bytecode development.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
@@ -62,33 +48,27 @@ find . -name "*.jar" -delete
%patch0 -p0
sed -i "s|pom.version|project.version|" pom.xml
+%mvn_file :%{name} %{name}
+%mvn_alias :%{name} %{name}:%{name}
+
%build
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 install javadoc:aggregate
+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
%install
+%mvn_install
-mkdir -p %{buildroot}%{_javadir}
-install -pm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{name}:%{name}"
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
%doc LICENSE.txt README.txt
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt
%changelog
+* Tue Jul 02 2013 gil cattaneo <puntogil(a)libero.it> 1.14.2-0.5.20120406cvs
+- build with XMvn
+- minor changes to adapt to current guideline
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.14.2-0.4.20120406cvs
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
10 years, 10 months
[shrinkwrap] build with XMvn
by gil
commit d4df393c490116bb43cf9627f611c6f97de4adc5
Author: gil <puntogil(a)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/%{namedversion}.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(a)libero.it> 1.1.2-2
+- build with XMvn
+- minor changes to adapt to current guideline
+
* Tue May 07 2013 gil cattaneo <puntogil(a)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
10 years, 10 months
[spec-version-maven-plugin] build with XMvn
by gil
commit 7abfe72ca26e581bfeca9772a51446bdafa07a0c
Author: gil <puntogil(a)libero.it>
Date: Tue Jul 2 14:44:06 2013 +0200
build with XMvn
spec-version-maven-plugin.spec | 43 +++++++++++++---------------------------
1 files changed, 14 insertions(+), 29 deletions(-)
---
diff --git a/spec-version-maven-plugin.spec b/spec-version-maven-plugin.spec
index 0dc05e1..c35a8af 100644
--- a/spec-version-maven-plugin.spec
+++ b/spec-version-maven-plugin.spec
@@ -1,8 +1,7 @@
Name: spec-version-maven-plugin
Version: 1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Spec Version Maven Plugin
-Group: Development/Libraries
License: CDDL or GPLv2 with exceptions
URL: http://glassfish.java.net/
# svn export https://svn.java.net/svn/glassfish~svn/tags/spec-version-maven-plugin-1.2
@@ -13,7 +12,7 @@ Source0: %{name}-%{version}-src-svn.tar.gz
Source1: glassfish-LICENSE.txt
BuildRequires: java-devel
-BuildRequires: jvnet-parent
+BuildRequires: mvn(net.java:jvnet-parent)
BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.apache.maven:maven-model)
@@ -21,19 +20,13 @@ BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.codehaus.plexus:plexus-resources)
# test dep
-BuildRequires: junit
-BuildRequires: maven-plugin-bundle
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: maven-local
BuildRequires: maven-plugin-build-helper
BuildRequires: maven-plugin-plugin
-Requires: mvn(org.apache.maven:maven-core)
-Requires: mvn(org.apache.maven:maven-model)
-Requires: mvn(org.apache.maven:maven-plugin-api)
-Requires: mvn(org.codehaus.plexus:plexus-resources)
-
-Requires: java
BuildArch: noarch
%description
@@ -41,7 +34,6 @@ Maven Plugin to configure APIs version and
specs in a MANIFEST.MF file.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
%description javadoc
@@ -55,32 +47,25 @@ sed -i "s|mvn|mvn-rpmbuild|" src/main/resources/checkVersion.sh
cp -p %{SOURCE1} LICENSE.txt
sed -i 's/\r//' LICENSE.txt
+%mvn_file :%{name} %{name}
+
%build
-mvn-rpmbuild package javadoc:aggregate
+%mvn_build
%install
+%mvn_install
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
%doc LICENSE.txt
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt
%changelog
+* Tue Jul 02 2013 gil cattaneo <puntogil(a)libero.it> 1.2-2
+- build with XMvn
+- minor changes to adapt to current guideline
+
* Wed May 22 2013 gil cattaneo <puntogil(a)libero.it> 1.2-1
- initial rpm
\ No newline at end of file
10 years, 10 months
[sshj] build with XMvn
by gil
commit a7cfc27e405e9a4440e89441a5bb19f553af2477
Author: gil <puntogil(a)libero.it>
Date: Tue Jul 2 14:19:10 2013 +0200
build with XMvn
.gitignore | 1 +
sources | 2 +-
sshj.spec | 70 +++++++++++++++++++----------------------------------------
3 files changed, 25 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7f68548..6ab6f5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/sshj-0.8.0.tar.xz
/sshj-0.8.1.tar.xz
+/v0.8.1.tar.gz
diff --git a/sources b/sources
index c1553d4..3353549 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f8da50e2c5f5c93bd1603dcc7d196488 sshj-0.8.1.tar.xz
+2fe8c45001e3c229a8370885503b9e82 v0.8.1.tar.gz
diff --git a/sshj.spec b/sshj.spec
index bcae826..5c78df2 100644
--- a/sshj.spec
+++ b/sshj.spec
@@ -1,93 +1,69 @@
Name: sshj
Version: 0.8.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: SSHv2 library for Java
-Group: Development/Libraries
License: ASL 2.0
URL: http://schmizz.net/sshj/
-# git clone git://github.com/shikhar/sshj.git sshj-0.8.1
-# cd sshj-0.8.1 && git archive --format=tar --prefix=sshj-0.8.1/ v0.8.1 | xz > sshj-0.8.1.tar.xz
-Source0: %{name}-%{version}.tar.xz
-
-Patch0: %{name}-0.8.0-use-jzlib-as-system-dependency.patch
-
+Source0: https://github.com/shikhar/sshj/archive/v%{version}.tar.gz
BuildRequires: java-devel
-BuildRequires: jpackage-utils
-BuildRequires: apache-sshd
-BuildRequires: bouncycastle
-BuildRequires: jzlib
-BuildRequires: slf4j
+BuildRequires: mvn(com.jcraft:jzlib) >= 1.1.0-2
+BuildRequires: mvn(org.bouncycastle:bcprov-jdk16)
+BuildRequires: mvn(org.slf4j:slf4j-api)
# test deps
-BuildRequires: junit
-BuildRequires: logback
-BuildRequires: mockito
+BuildRequires: mvn(ch.qos.logback:logback-classic)
+BuildRequires: mvn(ch.qos.logback:logback-core)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.mina:mina-core)
+BuildRequires: mvn(org.apache.sshd:sshd-core)
+BuildRequires: mvn(org.mockito:mockito-all)
BuildRequires: maven-local
BuildRequires: maven-assembly-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-bundle
-BuildRequires: maven-resources-plugin
BuildRequires: maven-source-plugin
-BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4
-Requires: apache-sshd
-Requires: bouncycastle
-Requires: jzlib
-Requires: slf4j
-
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
SSH, scp and sftp library for Java.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
%prep
%setup -q
-%patch0 -p0
+
+# SmokeTest.setUp:37 ? NoClassDefFound org/apache/mina/core/service/IoHandler
+%pom_add_dep org.apache.mina:mina-core::test
# Some classes moved from JUnit to hamcrest
sed -i -e 's/org.junit.internal.matchers/org.hamcrest.core/' src/test/java/net/schmizz/sshj/transport/verification/OpenSSHKnownHostsTest.java
+%mvn_file :%{name} %{name}
%build
-mvn-rpmbuild -D_javadir=%{_javadir} install javadoc:aggregate
+%mvn_build
%install
+%mvn_install
-mkdir -p %{buildroot}%{_javadir}
-install -pm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
%doc CONTRIBUTORS LICENSE NOTICE README.rst
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
%changelog
+* Tue Jul 02 2013 gil cattaneo <puntogil(a)libero.it> 0.8.1-5
+- build with XMvn
+- minor changes to adapt to current guideline
+
* Mon Apr 22 2013 Tomas Radej <tradej(a)redhat.com> - 0.8.1-4
- Fixed tests for new JUnit and hamcrest
10 years, 10 months
[apache-commons-chain] build with XMvn
by gil
commit 0382c59efd2b3ca96c97db2fc4413de7e1985bdf
Author: gil <puntogil(a)libero.it>
Date: Tue Jul 2 12:54:33 2013 +0200
build with XMvn
apache-commons-chain.spec | 89 ++++++++++++++++++---------------------------
1 files changed, 35 insertions(+), 54 deletions(-)
---
diff --git a/apache-commons-chain.spec b/apache-commons-chain.spec
index be5f3b1..7479d60 100644
--- a/apache-commons-chain.spec
+++ b/apache-commons-chain.spec
@@ -2,53 +2,36 @@
%global short_name commons-%{base_name}
Name: apache-commons-chain
Version: 1.2
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: An implementation of the GoF Chain of Responsibility pattern
-Group: Development/Libraries
License: ASL 2.0
URL: http://commons.apache.org/%{base_name}/
Source0: ftp://ftp.gbnet.net/pub/apache/dist/commons/%{base_name}/source/%{short_n...
-# replace myfaces-api with jboss-jsf-2.1-api
-Patch0: %{name}-%{version}-pom.patch
# javax.servlet 3.0 api support
-Patch1: %{name}-%{version}-tests-servlet30.patch
+Patch0: %{name}-%{version}-tests-servlet30.patch
# javax.portlet 2.0 api support
-Patch2: %{name}-%{version}-portlet20.patch
+Patch1: %{name}-%{version}-portlet20.patch
BuildRequires: java-devel
-BuildRequires: jpackage-utils
-BuildRequires: apache-commons-beanutils
-BuildRequires: apache-commons-digester
-BuildRequires: apache-commons-logging
-BuildRequires: jboss-jsf-2.1-api
-BuildRequires: portlet-2.0-api
-BuildRequires: tomcat-servlet-3.0-api
+BuildRequires: mvn(commons-beanutils:commons-beanutils)
+BuildRequires: mvn(commons-digester:commons-digester)
+BuildRequires: mvn(commons-logging:commons-logging)
+BuildRequires: mvn(javax.portlet:portlet-api)
+BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api)
+BuildRequires: mvn(org.jboss.spec.javax.faces:jboss-jsf-api_2.1_spec)
# test deps
-BuildRequires: junit
+BuildRequires: mvn(junit:junit)
+BuildRequires: buildnumber-maven-plugin
BuildRequires: maven-local
BuildRequires: maven-antrun-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-bundle
-BuildRequires: maven-resources-plugin
+BuildRequires: maven-remote-resources-plugin
BuildRequires: maven-site-plugin
-BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
-Requires: apache-commons-beanutils
-Requires: apache-commons-digester
-Requires: apache-commons-logging
-Requires: jboss-jsf-2.1-api
-Requires: portlet-2.0-api
-Requires: tomcat-servlet-3.0-api
-
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -70,9 +53,7 @@ whether or not processing for the current chain has been completed
command in the chain (false).
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
@@ -83,41 +64,41 @@ find . -name '*.class' -delete
find . -name '*.jar' -delete
perl -pi -e 's/\r$//g;' *.txt
-%patch0 -p0
-%patch1 -p1
-%patch2 -p0
-# Failed tests: testDefaut(org.apache.commons.chain.config.ConfigParserTestCase): Correct command count expected:<17> but was:<19>
-rm -r src/test/org/apache/commons/chain/config/ConfigParserTestCase.java
-%build
+%patch0 -p1
+%patch1 -p0
+# Failed tests: testDefaut(org.apache.commons.chain.config.ConfigParserTestCase):
+# Correct command count expected:<17> but was:<19>
+rm -r src/test/org/apache/commons/chain/config/ConfigParserTestCase.java
-mvn-rpmbuild -Dmaven.compile.source=1.5 -Dmaven.compile.target=1.5 install javadoc:aggregate
+%pom_remove_dep :myfaces-api
+%pom_add_dep org.jboss.spec.javax.faces:jboss-jsf-api_2.1_spec
+# Force tomcat apis
+%pom_remove_dep javax.servlet:servlet-api
+%pom_add_dep org.apache.tomcat:tomcat-servlet-api
-%install
+%mvn_file :%{short_name} %{name}
+%mvn_file :%{short_name} %{short_name}
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-( cd %{buildroot}%{_javadir} && ln -s %{name}.jar %{short_name}.jar )
+%build
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar
+%mvn_build -- -Dmaven.compile.source=1.5 -Dmaven.compile.target=1.5
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%install
+%mvn_install
-%files
-%{_javadir}/%{name}.jar
-%{_javadir}/%{short_name}.jar
-%{_mavenpomdir}/JPP-%{short_name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt NOTICE.txt
%changelog
+* Tue Jul 02 2013 gil cattaneo <puntogil(a)libero.it> 1.2-7
+- build with XMvn
+- swith to pom macros
+- minor changes to adapt to current guideline
+
* Sun Feb 17 2013 gil cattaneo <puntogil(a)libero.it> 1.2-6
- added missing BR surefire-provider-junit
10 years, 10 months