commit 5cef1f661ea07ade0adba28d7ca32347ee405d14 Author: Michal Srb msrb@redhat.com Date: Fri Jan 25 14:42:16 2013 +0100
Build with xmvn
- Added BR on plexus-component-factories-pom
plexus-ant-factory.spec | 41 ++++++++++++----------------------------- 1 files changed, 12 insertions(+), 29 deletions(-) --- diff --git a/plexus-ant-factory.spec b/plexus-ant-factory.spec index da2f0da..9260556 100644 --- a/plexus-ant-factory.spec +++ b/plexus-ant-factory.spec @@ -33,7 +33,7 @@
Name: %{parent}-%{subname} Version: 1.0 -Release: 0.9.a2.1%{?dist} +Release: 0.10.a2.1%{?dist} Epoch: 0 Summary: Plexus Ant component factory # Email from copyright holder confirms license. @@ -48,8 +48,7 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
BuildArch: noarch
-BuildRequires: jpackage-utils >= 0:1.7.2 -BuildRequires: maven +BuildRequires: xmvn BuildRequires: maven-compiler-plugin BuildRequires: maven-install-plugin BuildRequires: maven-jar-plugin @@ -64,11 +63,8 @@ BuildRequires: ant BuildRequires: classworlds BuildRequires: plexus-containers-container-default BuildRequires: plexus-utils +BuildRequires: plexus-component-factories-pom
-Requires: ant -Requires: classworlds -Requires: plexus-containers-container-default -Requires: plexus-utils
%description Ant component class creator for Plexus. @@ -76,7 +72,6 @@ Ant component class creator for Plexus. %package javadoc Summary: Javadoc for %{name} Group: Documentation -Requires: jpackage-utils
%description javadoc Javadoc for %{name}. @@ -87,43 +82,31 @@ cp %{SOURCE1} LICENSE
%build -mvn-rpmbuild -e install javadoc:aggregate +%mvn_file : %{parent}/%{subname} +%mvn_build
%install +%mvn_install
-# jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{parent} -install -pm 644 target/%{name}-%{version}*.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}.jar - -# pom -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -pm 644 pom.xml \ - $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom -%add_maven_depmap JPP.%{parent}-%{subname}.pom %{parent}/%{subname}.jar - -# javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%pre javadoc # workaround for rpm bug, can be removed in F-20 [ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-%files +%files -f .mfiles %doc LICENSE %dir %{_javadir}/plexus -%{_javadir}/%{parent}/%{subname}.jar -%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom -%{_mavendepmapfragdir}/%{name}
-%files javadoc +%files javadoc -f .mfiles-javadoc %doc LICENSE -%doc %{_javadocdir}/*
%changelog +* Thu Jan 17 2013 Michal Srb msrb@redhat.com - 0:1.0-0.10.a2.1 +- Build with xmvn +- Added BR on plexus-component-factories-pom + * Mon Dec 10 2012 Michal Srb msrb@redhat.com - 0:1.0-0.9.a2.1 - migrated to plexus-containers-container-default (#878580) - using global is preferred over define when defining macros