commit 7a7f2f5072c82f8a09256d96b11deb3dc7ea1686 Author: Stanislav Ochotnicky sochotnicky@redhat.com Date: Fri Nov 16 15:09:54 2012 +0100
Fix license tag to be ASL 2.0 (no plexus licensing anywhere)
- Update to new guidelines
plexus-cli.spec | 28 ++++++++++------------------ 1 files changed, 10 insertions(+), 18 deletions(-) --- diff --git a/plexus-cli.spec b/plexus-cli.spec index 991418e..bed5bd5 100644 --- a/plexus-cli.spec +++ b/plexus-cli.spec @@ -33,10 +33,10 @@
Name: %{parent}-%{subname} Version: 1.2 -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 0 Summary: Command Line Interface facilitator for Plexus -License: ASL 2.0 and Plexus +License: ASL 2.0 Group: Development/Libraries URL: http://plexus.codehaus.org/ # svn export http://svn.codehaus.org/plexus/archive/plexus-tools/tags/plexus-cli-1.2 @@ -51,7 +51,6 @@ Patch0: plexus-cli-licenseheaders.patch BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.3 -BuildRequires: ant >= 0:1.6.5 BuildRequires: junit BuildRequires: maven BuildRequires: maven-compiler-plugin @@ -72,8 +71,6 @@ BuildRequires: apache-commons-cli Requires: plexus-classworlds Requires: plexus-containers-container-default Requires: plexus-utils -Requires(post): jpackage-utils >= 0:1.7.3 -Requires(postun): jpackage-utils >= 0:1.7.3
%description The Plexus project seeks to create end-to-end developer tools for @@ -98,40 +95,35 @@ find . -name "*.jar" -exec rm -f {} ; %patch0 -p3
%build -mvn-rpmbuild \ - install javadoc:javadoc +mvn-rpmbuild install javadoc:javadoc
%install # jars install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus install -pm 644 target/%{name}-%{version}.jar \ $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}.jar -%add_to_maven_depmap org.codehaus.plexus %{name} %{namedversion} JPP/%{parent} %{subname}
# 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 plexus/%{subname}.jar + # javadoc install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%post -%update_maven_depmap - -%postun -%update_maven_depmap - -%files -%{_javadir}/%{parent}/* -%{_mavenpomdir}/* -%{_mavendepmapfragdir}/* +%files -f .mfiles
%files javadoc %doc %{_javadocdir}/*
%changelog +* Fri Nov 16 2012 Stanislav Ochotnicky sochotnicky@redhat.com - 0:1.2-13 +- Fix license tag to be ASL 2.0 (no plexus licensing anywhere) +- Update to new guidelines + * Sat Jul 21 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 0:1.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
java-sig-commits@lists.fedoraproject.org