[maven-remote-resources-plugin] Add missing requires on maven-shared-downloader.

Alexander Kurtakov akurtakov at fedoraproject.org
Tue Jul 5 11:50:02 UTC 2011


commit a63e8a89d3257a281f0023a28d016a77c07ce65c
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Jul 5 14:49:35 2011 +0300

    Add missing requires on maven-shared-downloader.

 maven-remote-resources-plugin.spec |   31 +++++++++----------------------
 1 files changed, 9 insertions(+), 22 deletions(-)
---
diff --git a/maven-remote-resources-plugin.spec b/maven-remote-resources-plugin.spec
index c87444d..91bbff5 100644
--- a/maven-remote-resources-plugin.spec
+++ b/maven-remote-resources-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-remote-resources-plugin
 Version:        1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Maven Remote Resources Plugin
 
 Group:          Development/Libraries
@@ -44,9 +44,7 @@ Requires:       java
 Requires:       jpackage-utils
 Requires:       maven-wagon
 Requires:       maven-shared-artifact-resolver
-
-Requires(post):       jpackage-utils
-Requires(postun):     jpackage-utils
+Requires:       maven-shared-downloader
 
 Obsoletes:      maven2-plugin-remote-resources <= 0:2.0.8
 Provides:       maven2-plugin-remote-resources = 1:%{version}-%{release}
@@ -82,39 +80,28 @@ mvn-rpmbuild -Dmaven.test.skip=true install javadoc:javadoc
 %install
 # jars
 install -Dpm 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
-
-%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
-
 # poms
 install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
-%post
-%update_maven_depmap
 
-%postun
-%update_maven_depmap
-
-%clean
-rm -rf %{buildroot}
+# javadoc
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Jul 5 2011 Alexander Kurtakov <akurtako at redhat.com> 1.2-2
+- Add missing requires on maven-shared-downloader.
+
 * Thu Mar 17 2011 Alexander Kurtakov <akurtako at redhat.com> 1.2-1
 - Update to upstream 1.2 release.
 


More information about the scm-commits mailing list