[ws-commons-util] * Fri Sep 10 2010 Alexander Kurtakov <akurtako at redhat.com> 1.0.1-16 - Use default file attr. - Use n

[Alexander Kurtakov]

commit c9f7b4e41336ce5833618ebd650d363b44e1ea17
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Sep 10 21:28:34 2010 +0300

    * Fri Sep 10 2010 Alexander Kurtakov <akurtako at redhat.com> 1.0.1-16
    - Use default file attr.
    - Use newer maven plugins' names.

 ws-commons-util.spec |   52 ++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 38 insertions(+), 14 deletions(-)
---
diff --git a/ws-commons-util.spec b/ws-commons-util.spec
index 0957a21..cf3b424 100644
--- a/ws-commons-util.spec
+++ b/ws-commons-util.spec
@@ -2,8 +2,8 @@
 
 Name:           ws-commons-util
 Version:        1.0.1
-Release:        14%{?dist}
-Summary:        Common utilities from the Apache Web Services Project 
+Release:        16%{?dist}
+Summary:        Common utilities from the Apache Web Services Project
 
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -23,16 +23,16 @@ BuildArch:      noarch
 BuildRequires:  jpackage-utils >= 1.5
 %if %{with_maven}
 BuildRequires:  maven2
-BuildRequires:  maven2-plugin-jar
-BuildRequires:  maven2-plugin-compiler
-BuildRequires:  maven2-plugin-install
-BuildRequires:  maven2-plugin-source
-BuildRequires:  maven2-plugin-assembly
-BuildRequires:  maven2-plugin-javadoc
-BuildRequires:  maven2-plugin-resources
-BuildRequires:  maven2-plugin-surefire
+BuildRequires:  maven-jar-plugin
+BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-install-plugin
+BuildRequires:  maven-source-plugin
+BuildRequires:  maven-assembly-plugin
+BuildRequires:  maven-javadoc-plugin
+BuildRequires:  maven-resources-plugin
+BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-surefire-provider-junit
-BuildRequires:  maven2-plugin-eclipse
+BuildRequires:  maven-eclipse-plugin
 BuildRequires:  maven-doxia
 BuildRequires:  maven-doxia-sitetools
 %else
@@ -41,7 +41,10 @@ BuildRequires:  ant
 BuildRequires:  junit
 BuildRequires:  java-javadoc
 
-%description 
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
+
+%description
 This is version 1.0.1 of the common utilities from the Apache Web
 Services Project.
 
@@ -81,6 +84,12 @@ install -dm 755 $RPM_BUILD_ROOT%{_javadir}
 install -pm 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
+# install maven pom file
+install -Dm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+
+# ... and maven depmap
+%add_to_maven_depmap org.apache.ws.commons %{name} %{version} JPP %{name}
+
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pR target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -88,17 +97,32 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
 %files
-%defattr(644,root,root,755)
+%defattr(-,root,root,-)
 %doc LICENSE.txt
 %{_javadir}/*.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
-%defattr(644,root,root,755)
+%defattr(-,root,root,-)
 %doc %{_javadocdir}/%{name}-%{version}
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Fri Sep 10 2010 Alexander Kurtakov <akurtako at redhat.com> 1.0.1-16
+- Use default file attr.
+- Use newer maven plugins' names.
+
+* Tue Aug 24 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.0.1-15
+- Install maven depmaps and pom.xml files
+
 * Wed Jan 13 2010 Andrew Overholt <overholt at redhat.com> 1.0.1-14
 - Add missing maven-doxia{,-sitetools} BRs.