commit ba2c14d4a7fcf01c7ce2606bb11dfbb6da0a59fb Author: Stanislav Ochotnicky sochotnicky@redhat.com Date: Mon May 21 17:27:11 2012 +0200
Cleanup spec
- Use maven-3.x to build
plexus-component-api.spec | 73 +++++++++++++++++--------------------------- 1 files changed, 28 insertions(+), 45 deletions(-) --- diff --git a/plexus-component-api.spec b/plexus-component-api.spec index 927444a..46327f7 100644 --- a/plexus-component-api.spec +++ b/plexus-component-api.spec @@ -2,7 +2,7 @@
Name: plexus-component-api Version: 1.0 -Release: 0.7.alpha15%{?dist} +Release: 0.8.alpha15%{?dist} Summary: Plexus Component API
Group: Development/Libraries @@ -11,24 +11,22 @@ URL: http://svn.codehaus.org/plexus/plexus-containers/tags/plexus-con #svn export http://svn.codehaus.org/plexus/plexus-containers/tags/plexus-containers-1.0-... plexus-component-api-1.0-alpha-15 #tar zcf plexus-component-api-1.0-alpha-15.tar.gz plexus-component-api-1.0-alpha-15/ Source0: plexus-component-api-1.0-alpha-15.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils >= 0:1.7.2 -BuildRequires: ant, ant-nodeps -BuildRequires: maven2 >= 0:2.0.4-9 -BuildRequires: maven2-plugin-assembly -BuildRequires: maven2-plugin-compiler -BuildRequires: maven2-plugin-install -BuildRequires: maven2-plugin-jar -BuildRequires: maven2-plugin-resources -BuildRequires: maven2-plugin-site -BuildRequires: maven2-plugin-plugin +BuildRequires: maven +BuildRequires: maven-assembly-plugin +BuildRequires: maven-compiler-plugin +BuildRequires: maven-install-plugin +BuildRequires: maven-jar-plugin +BuildRequires: maven-resources-plugin +BuildRequires: maven-site-plugin +BuildRequires: maven-plugin-plugin BuildRequires: maven-surefire-maven-plugin BuildRequires: maven-surefire-provider-junit -BuildRequires: maven2-plugin-javadoc +BuildRequires: maven-javadoc-plugin BuildRequires: maven-doxia BuildRequires: maven-doxia-sitetools BuildRequires: plexus-digest @@ -38,8 +36,6 @@ Requires: java-devel >= 1:1.6.0 Requires: plexus-digest Requires: plexus-classworlds Requires: jpackage-utils -Requires(post): jpackage-utils >= 0:1.7.2 -Requires(postun): jpackage-utils >= 0:1.7.2
%description Plexus Component API @@ -47,6 +43,7 @@ Plexus Component API %package javadoc Group: Documentation Summary: Javadoc for %{name} +Requires: jpackage-utils
%description javadoc API documentation for %{name}. @@ -56,58 +53,44 @@ API documentation for %{name}. %setup -q -n %{name}-%{project_version}
%build -export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository -mvn-jpp \ - -e \ - -Dmaven2.jpp.mode=true \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - install javadoc:javadoc +mvn-rpmbuild -e package javadoc:javadoc
%install - -rm -rf %{buildroot} - # jars install -d -m 0755 %{buildroot}%{_javadir}/plexus -install -m 644 target/%{name}-%{project_version}.jar %{buildroot}%{_javadir}/plexus +install -m 644 target/%{name}-%{project_version}.jar \ + %{buildroot}%{_javadir}/plexus/component-api.jar
-(cd %{buildroot}%{_javadir}/plexus && for jar in *-%{project_version}*; \ - do ln -sf ${jar} `echo $jar| sed "s|-%{project_version}||g"`; done) - -%add_to_maven_depmap org.codehaus.plexus %{name} %{project_version} JPP/plexus %{name}
# poms install -d -m 755 %{buildroot}%{_mavenpomdir} install -pm 644 pom.xml \ - %{buildroot}%{_mavenpomdir}/JPP.plexus-%{name}.pom + %{buildroot}%{_mavenpomdir}/JPP.%{name}.pom
-# javadoc -install -d -m 0755 %{buildroot}%{_javadocdir}/plexus/%{name}-%{version} -cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}-%{version}/ -ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/plexus/%{name} -rm -rf target/site/api* +%add_maven_depmap JPP.%{name}.pom plexus/component-api.jar
-%post -%update_maven_depmap - -%postun -%update_maven_depmap +# javadoc +install -d -m 0755 %{buildroot}%{_javadocdir}/plexus/%{name} +cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}
-%clean -rm -rf %{buildroot} +%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 -%defattr(-,root,root,-) %{_javadir}/plexus/* %{_mavenpomdir}/* %{_mavendepmapfragdir}/*
%files javadoc -%defattr(-,root,root,-) -%{_javadocdir}/plexus/%{name}-%{version} %{_javadocdir}/plexus/%{name}
%changelog +* Mon May 21 2012 Stanislav Ochotnicky sochotnicky@redhat.com - 1.0-0.8.alpha15 +- Cleanup spec +- Use maven-3.x to build + * Sat Jan 14 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.0-0.7.alpha15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
@@ -124,7 +107,7 @@ rm -rf %{buildroot} - Add BR: plexus-digest
* Thu May 20 2010 Yong Yang yyang@redhat.com - 0:1.0-0.2.alpha15 -- Change JPP pom name to prefix JPP- +- Change JPP pom name to prefix JPP-
* Tue May 04 2010 Yong Yang yyang@redhat.com - 0:1.0-0.1.alpha15 - Initial build
java-sig-commits@lists.fedoraproject.org