[beust-jcommander] Use the new maven macro.

Alexander Kurtakov akurtakov at fedoraproject.org
Wed Nov 30 21:10:31 UTC 2011


commit 1341e3514d709e3ee981ce04aadee8c49ca4f20a
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date:   Wed Nov 30 23:10:16 2011 +0200

    Use the new maven macro.

 beust-jcommander.spec |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/beust-jcommander.spec b/beust-jcommander.spec
index 86a863d..1b551f0 100644
--- a/beust-jcommander.spec
+++ b/beust-jcommander.spec
@@ -4,7 +4,7 @@
 
 Name:             beust-%{short_name}
 Version:          1.17
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Java framework for parsing command line parameters
 License:          ASL 2.0
 Group:            Development/Libraries
@@ -23,8 +23,6 @@ BuildRequires:    testng
 
 Requires:         java
 Requires:         jpackage-utils
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
 
 %description
 JCommander is a very small Java framework
@@ -56,18 +54,12 @@ install -p -m 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap %{group_id} %{short_name} %{version} JPP %{name}
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 # javadoc
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
 %doc license.txt README.markdown
 %{_javadir}/%{name}.jar
@@ -79,6 +71,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Nov 30 2011 Alexander Kurtakov <akurtako at redhat.com> 1.17-3
+- Use the new maven macro.
+
 * Mon May 16 2011 Jaromir Capik <jcapik at redhat.com> - 1.17-2
 - Unwanted comment removal
 - Target javadoc:jar replaced with javadoc:aggregate


More information about the scm-commits mailing list