[buildnumber-maven-plugin] Add missing (Build)Requires

Stanislav Ochotnicky sochotni at fedoraproject.org
Thu Jun 30 07:20:53 UTC 2011


commit 85e31ae5a1f545c79c16eaf9d89be066b7d3d9f9
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Thu Jun 30 09:14:20 2011 +0200

    Add missing (Build)Requires
    
    - Use new add_maven_depmap macro

 buildnumber-maven-plugin.spec |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)
---
diff --git a/buildnumber-maven-plugin.spec b/buildnumber-maven-plugin.spec
index cacb4c2..e07efde 100644
--- a/buildnumber-maven-plugin.spec
+++ b/buildnumber-maven-plugin.spec
@@ -1,6 +1,6 @@
 Name:           buildnumber-maven-plugin
 Version:        1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Build Number Maven Plugin
 
 Group:          Development/Libraries
@@ -40,18 +40,25 @@ BuildRequires: maven-surefire-provider-junit
 BuildRequires: maven-surefire-plugin
 BuildRequires: maven-plugin-cobertura
 BuildRequires: plexus-containers-component-javadoc
+BuildRequires: plexus-containers-container-default
+BuildRequires: plexus-utils
 BuildRequires: svnkit
 BuildRequires: jna
 BuildRequires: mojo-parent
+BuildRequires: maven-project
+BuildRequires: maven-scm
+
 
 Requires: java
 Requires: maven
+Requires: maven-project
+Requires: maven-scm
 Requires: jna
 Requires: svnkit
 Requires: jpackage-utils
 Requires: mojo-parent
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
+Requires: plexus-containers-container-default
+Requires: plexus-utils
 
 %description
 This mojo is designed to get a unique build number for each time you build
@@ -100,13 +107,14 @@ mvn-rpmbuild -DskipTests=true \
 install -d -m 0755 %{buildroot}%{_javadir}
 install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
 
-%add_to_maven_depmap org.codehaus.mojo buildnumber-maven-plugin %{version} JPP buildnumber-maven-plugin
 
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
@@ -116,23 +124,21 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
 [ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
 rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
 %doc LICENSE.txt
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
 %doc LICENSE.txt
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jun 30 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.0-3
+- Add missing (Build)Requires
+- Use new add_maven_depmap macro
+
 * Wed Jun 8 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0-2
 - Do not require maven2.
 - Guidelines fixes.


More information about the scm-commits mailing list