From 61da59ef4cc6b3e958c6c4ab9f58f2e81b9e4fe1 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Thu, 17 Jan 2013 13:50:10 +0100 Subject: [PATCH] Build with xmvn --- plexus-interpolation.spec | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/plexus-interpolation.spec b/plexus-interpolation.spec index ac447c6..0b65b65 100644 --- a/plexus-interpolation.spec +++ b/plexus-interpolation.spec @@ -1,6 +1,6 @@ Name: plexus-interpolation Version: 1.15 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Plexus Interpolation API Group: Development/Libraries @@ -12,7 +12,7 @@ BuildArch: noarch BuildRequires: java-devel BuildRequires: junit -BuildRequires: maven +BuildRequires: xmvn BuildRequires: maven-resources-plugin BuildRequires: maven-compiler-plugin BuildRequires: maven-jar-plugin @@ -32,7 +32,6 @@ related projects. %package javadoc Group: Documentation Summary: Javadoc for %{name} -Requires: jpackage-utils %description javadoc API documentation for %{name}. @@ -41,34 +40,20 @@ API documentation for %{name}. %setup -q -n %{name}-%{name}-%{version} %build -mvn-rpmbuild install javadoc:javadoc +%mvn_file : plexus/interpolation +%mvn_build %install -# jars -install -d -m 0755 %{buildroot}%{_javadir}/plexus -install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/interpolation.jar +%mvn_install +%files -f .mfiles -# poms -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml \ - %{buildroot}%{_mavenpomdir}/JPP.%{name}.pom - -%add_maven_depmap JPP.%{name}.pom plexus/interpolation.jar - -# javadoc -install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} -cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/ - -%files -%{_javadir}/plexus/interpolation.jar -%{_mavenpomdir}/JPP.%{name}.pom -%{_mavendepmapfragdir}/%{name} - -%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %changelog +* Thu Jan 17 2013 Michal Srb - 1.15-4 +- Build with xmvn + * Mon Nov 19 2012 Stanislav Ochotnicky - 1.15-3 - Fix source URL to be stable