commit e16f828624b6c4eca4d9831e84c2a8fb026e80ca Author: Alexander Kurtakov akurtakov@gmail.com Date: Fri Jun 17 20:09:27 2011 +0300
Build with maven 3
maven-ejb-plugin.spec | 37 +++++++++++-------------------------- 1 files changed, 11 insertions(+), 26 deletions(-) --- diff --git a/maven-ejb-plugin.spec b/maven-ejb-plugin.spec index 7200375..181a8e6 100644 --- a/maven-ejb-plugin.spec +++ b/maven-ejb-plugin.spec @@ -1,19 +1,18 @@ Name: maven-ejb-plugin Version: 2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Maven EJB Plugin
Group: Development/Libraries License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-ejb-plugin/ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%%7Bname%7D/%%7Bversi... -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils -BuildRequires: maven2 +BuildRequires: maven BuildRequires: maven-plugin-plugin BuildRequires: maven-compiler-plugin BuildRequires: maven-install-plugin @@ -27,7 +26,7 @@ BuildRequires: plexus-archiver BuildRequires: maven-plugin-testing-harness BuildRequires: maven-surefire-provider-junit
-Requires: maven2 +Requires: maven Requires: java Requires: jpackage-utils Requires: maven-archiver @@ -55,26 +54,17 @@ API documentation for %{name}.
%prep -%setup -q #You may need to update this according to your Source0 +%setup -q
%build -export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository -mvn-jpp \ - -e \ - -Dmaven2.jpp.mode=true \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ +mvn-rpmbuild \ -Dmaven.test.skip=true \ install javadoc:javadoc
%install -rm -rf %{buildroot} - # jars install -d -m 0755 %{buildroot}%{_javadir} -install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar - -(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \ - do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.maven.plugins maven-ejb-plugin %{version} JPP maven-ejb-plugin
@@ -84,10 +74,8 @@ install -pm 644 pom.xml \ %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# javadoc -install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version} -cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/ -ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} -rm -rf target/site/api* +install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%post %update_maven_depmap @@ -95,21 +83,18 @@ rm -rf target/site/api* %postun %update_maven_depmap
-%clean -rm -rf %{buildroot} - %files -%defattr(-,root,root,-) %{_javadir}/* %{_mavenpomdir}/* %{_mavendepmapfragdir}/*
%files javadoc -%defattr(-,root,root,-) -%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name}
%changelog +* Fri Jun 17 2011 Alexander Kurtakov akurtako@redhat.com 2.3-3 +- Build with maven 3. + * Tue Feb 08 2011 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
java-sig-commits@lists.fedoraproject.org