commit f4e7db9bd360053e92aa5d81d4ee6c1c9684e284 Author: Michal Srb msrb@redhat.com Date: Tue Jan 22 15:19:25 2013 +0100
Build with xmvn
-Remove custom depmap
maven-changes-plugin.depmap | 9 ------ maven-changes-plugin.spec | 58 +++++++----------------------------------- 2 files changed, 10 insertions(+), 57 deletions(-) --- diff --git a/maven-changes-plugin.spec b/maven-changes-plugin.spec index ab6ca51..d950a8b 100644 --- a/maven-changes-plugin.spec +++ b/maven-changes-plugin.spec @@ -1,13 +1,12 @@ Name: maven-changes-plugin Version: 2.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Plugin to support reporting of changes between releases
Group: Development/Libraries License: ASL 2.0 URL: http://maven.apache.org/plugins/%%7Bname%7D Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%%7Bname%7D/%%7Bversi... -Source1: %{name}.depmap
BuildArch: noarch
@@ -46,32 +45,6 @@ BuildRequires: xml-commons-apis BuildRequires: velocity BuildRequires: velocity-tools
-Requires: java -Requires: jpackage-utils -Requires: apache-commons-collections -Requires: jakarta-commons-httpclient -Requires: apache-commons-io -Requires: apache-commons-lang -Requires: apache-commons-logging -Requires: maven -Requires: maven-project -Requires: maven-doxia-sitetools -Requires: maven-shared-filtering -Requires: maven-shared-reporting-api -Requires: maven-shared-reporting-impl -Requires: plexus-containers-container-default -Requires: plexus-i18n -Requires: plexus-interpolation -Requires: plexus-mail-sender -Requires: plexus-utils -Requires: plexus-velocity -Requires: xmlrpc3-client -Requires: xmlrpc3-common -Requires: xerces-j2 -Requires: xml-commons-apis -Requires: velocity -Requires: velocity-tools - Obsoletes: maven2-plugin-changes <= 0:2.0.8 Provides: maven2-plugin-changes = 1:%{version}-%{release}
@@ -87,7 +60,6 @@ via email to your users. %package javadoc Group: Documentation Summary: Javadoc for %{name} -Requires: jpackage-utils
%description javadoc API documentation for %{name}. @@ -110,34 +82,24 @@ rm -rf src/main/java/org/apache/maven/plugin/github %pom_remove_dep org.eclipse.mylyn.github:
%build -mvn-rpmbuild -e \ - -Dmaven.local.depmap.file=%{SOURCE1} \ - -Dmaven.test.skip=true \ - install javadoc:aggregate +%mvn_file : %{name} +%mvn_build -f
%install -install -d -m 755 %{buildroot}%{_javadir} -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -d -m 755 %{buildroot}%{_javadocdir}/%{name} - -install -p -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar -install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap +%mvn_install
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
- -%files +%files -f .mfiles %doc LICENSE NOTICE -%{_javadir}/%{name}.jar -%{_mavenpomdir}/JPP-%{name}.pom -%{_mavendepmapfragdir}/%{name}
-%files javadoc +%files javadoc -f .mfiles-javadoc %doc LICENSE NOTICE -%{_javadocdir}/%{name}
%changelog +* Tue Feb 12 2013 Michal Srb msrb@redhat.com - 2.8-3 +- Build with xmvn +- Remove custom depmap + * Wed Feb 06 2013 Java SIG java-devel@lists.fedoraproject.org - 2.8-2 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local
java-sig-commits@lists.fedoraproject.org