[maven-artifact-resolver] Adapt to current guidelines
Michal Srb
msrb at fedoraproject.org
Mon Aug 5 09:56:54 UTC 2013
commit d85db948397e18c22d4b7156d08c385f4caf0d9f
Author: Michal Srb <msrb at redhat.com>
Date: Mon Aug 5 11:56:04 2013 +0200
Adapt to current guidelines
maven-artifact-resolver.spec | 53 ++++++++++++-----------------------------
1 files changed, 16 insertions(+), 37 deletions(-)
---
diff --git a/maven-artifact-resolver.spec b/maven-artifact-resolver.spec
index 722313c..5d94cec 100644
--- a/maven-artifact-resolver.spec
+++ b/maven-artifact-resolver.spec
@@ -1,10 +1,9 @@
Name: maven-artifact-resolver
Version: 1.0
-Release: 8%{?dist}
+Release: 9%{?dist}
# Epoch is added because the original package's version in maven-shared is 1.1-SNAPSHOT
Epoch: 1
Summary: Maven Artifact Resolution API
-Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/shared/%{name}
Source0: http://central.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
@@ -14,20 +13,15 @@ Patch0: %{name}-plexus.patch
BuildArch: noarch
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
BuildRequires: maven-local
-BuildRequires: maven-surefire-provider-junit4
-BuildRequires: plexus-containers-component-metadata
-BuildRequires: maven-artifact-manager
-BuildRequires: maven-project
-BuildRequires: maven-shared
-
-Requires: java
-Requires: jpackage-utils
-Requires: maven-artifact-manager
-Requires: maven-project
-Requires: maven-shared
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.maven.shared:maven-shared-components)
+BuildRequires: mvn(org.apache.maven:maven-artifact)
+BuildRequires: mvn(org.apache.maven:maven-artifact-manager)
+BuildRequires: mvn(org.apache.maven:maven-compat)
+BuildRequires: mvn(org.apache.maven:maven-core)
+BuildRequires: mvn(org.apache.maven:maven-project)
+BuildRequires: mvn(org.easymock:easymock)
Obsoletes: maven-shared-artifact-resolver < %{epoch}:%{version}-%{release}
Provides: maven-shared-artifact-resolver = %{epoch}:%{version}-%{release}
@@ -37,9 +31,7 @@ Provides a component for plugins to easily resolve project dependencies.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
@@ -60,35 +52,22 @@ API documentation for %{name}.
rm src/test/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolverIT.java
%build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
%install
-# JAR
-install -dm 755 %{buildroot}%{_javadir}
-install -pm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+%mvn_install
-# POM
-install -dm 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-# JavaDoc
-install -Ddm 755 %{buildroot}/%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%add_maven_depmap
-
-%files
+%files -f .mfiles
%doc DEPENDENCIES LICENSE NOTICE
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
-%doc %{_javadocdir}/%{name}
%changelog
+* Mon Aug 05 2013 Michal Srb <msrb at redhat.com> - 1:1.0-9
+- Adapt to current guidelines
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list