diff --git a/maven-resources-plugin.spec b/maven-resources-plugin.spec index 5ab31e8..fbcc142 100644 --- a/maven-resources-plugin.spec +++ b/maven-resources-plugin.spec @@ -1,6 +1,6 @@ Name: maven-resources-plugin Version: 2.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Maven Resources Plugin Group: Development/Libraries @@ -9,19 +9,18 @@ URL: http://maven.apache.org/plugins/maven-resources-plugin #svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-resources-plugin-2.4.3 maven-resources-plugin-2.4.3 #tar zcf maven-resources-plugin-2.4.3.tar.gz maven-resources-plugin-2.4.3/ Source0: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: maven2 -BuildRequires: maven2-plugin-plugin -BuildRequires: maven2-plugin-resources +BuildRequires: maven +BuildRequires: maven-plugin-plugin +BuildRequires: maven-resources-plugin BuildRequires: maven-jar-plugin BuildRequires: maven-install-plugin BuildRequires: maven-compiler-plugin BuildRequires: maven-javadoc-plugin -BuildRequires: maven-surefire-maven-plugin +BuildRequires: maven-surefire-plugin BuildRequires: maven-surefire-provider-junit BuildRequires: maven-doxia-sitetools BuildRequires: maven-plugin-testing-harness @@ -29,7 +28,7 @@ BuildRequires: maven-shared-reporting-impl BuildRequires: plexus-digest Requires: maven-plugin-testing-harness -Requires: maven2 +Requires: maven Requires: jpackage-utils Requires: java Requires(post): jpackage-utils @@ -55,23 +54,14 @@ API documentation for %{name}. %setup -q -n %{name}-%{version} %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.failure.ignore=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-resources-plugin %{version} JPP maven-resources-plugin @@ -81,10 +71,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 @@ -92,21 +80,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 +* Tue Jun 21 2011 Alexander Kurtakov 2.4.3-3 +- Build with maven 3. + * Tue Feb 08 2011 Fedora Release Engineering - 2.4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild