[axis2/f19: 3/3] Merge branch 'f20' into f19

[madsa]

commit 8db76e777278ee38c35b0c1f57c0e552b2298763
Merge: de73b43 3419008
Author: Matt Spaulding <mspaulding06 at gmail.com>
Date:   Sun Oct 20 14:46:24 2013 -0700

    Merge branch 'f20' into f19
    
    Fix changelog entries

 axis2.spec |  136 +++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 75 insertions(+), 61 deletions(-)
---
diff --cc axis2.spec
index 0aad514,29afaf5..abc3492
--- a/axis2.spec
+++ b/axis2.spec
@@@ -1,24 -1,15 +1,15 @@@
- Name:           axis2
- Version:        1.6.1
- Release:        7%{?dist}
- Summary:        Java-based Web Services / SOAP / WSDL engine
- 
- Group:          Development/Libraries
- License:        ASL 2.0
- URL:            http://axis.apache.org/axis2/java/core/
- Source0:        http://mirror.metrocast.net/apache//axis/axis2/java/core/1.6.1/axis2-1.6.1-src.zip
- # Disable modules whose dependencies are not in Fedora.
- Patch0:         %{name}-disable-modules.patch
- # 1) Remove JSR deps which are now built into openjdk
- # 2) Fix javamail dep
- # 3) Remove gmaven code
- Patch1:         %{name}-dep-fixes.patch
+ Name:          axis2
+ Version:       1.6.1
 -Release:       9%{?dist}
++Release:       8%{?dist}
+ Summary:       Java-based Web Services / SOAP / WSDL engine
+ License:       ASL 2.0
+ URL:           http://axis.apache.org/axis2/java/core/
+ Source0:       http://mirror.metrocast.net/apache//axis/axis2/java/core/1.6.1/axis2-1.6.1-src.zip
  # wrap generated headers with ifndef/define/endif
- Patch2:         %{name}-AXIS2-5349.patch
- BuildArch:      noarch
+ Patch0:        %{name}-AXIS2-5349.patch
  
+ BuildArch:     noarch
  BuildRequires: java-devel
- BuildRequires: jpackage-utils
  BuildRequires: maven-local
  BuildRequires: maven-shared
  BuildRequires: maven-clean-plugin
@@@ -85,34 -112,24 +112,21 @@@ API documentation for %{name}
  dos2unix NOTICE.txt
  
  %install
- install -d -m 755 %{buildroot}%{_javadir}/%{name}
- install -d -m 755 %{buildroot}%{_mavenpomdir}
- 
- # parent POM
- cp modules/parent/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-parent.pom
- %add_maven_depmap JPP.%{name}-parent.pom
+ %mvn_install
  
- for mod in resource-bundle adb adb-codegen codegen kernel saaj; do
-   install -m 644 modules/${mod}/target/%{name}-${mod}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${mod}.jar
-   cp modules/${mod}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-${mod}.pom
-   %add_maven_depmap JPP.%{name}-%{name}-${mod}.pom %{name}/%{name}-${mod}.jar
- done
- 
- install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
- cp -rp target/site/api/* %{buildroot}%{_javadocdir}/%{name}
- 
- %files
+ %files -f .mfiles
  %doc LICENSE.txt NOTICE.txt README.txt release-notes.html
- %{_javadir}/%{name}
- %{_mavenpomdir}/JPP*.pom
- %{_mavendepmapfragdir}/%{name}
- 
- %files javadoc
- %doc LICENSE.txt
- %{_javadocdir}/%{name}
+ %dir %{_javadir}/%{name}
  
+ %files javadoc -f .mfiles-javadoc
+ %doc LICENSE.txt NOTICE.txt
  
  %changelog
 -* Thu Sep 05 2013 gil cattaneo <puntogil at libero.it> 1.6.1-9
++* Thu Sep 05 2013 gil cattaneo <puntogil at libero.it> 1.6.1-8
+ - fix rhbz#992009
+ - update to current packaging guidelines
+ - use pom macros
+ 
 -* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-8
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 -
  * Mon Feb 25 2013 Andy Grimm <agrimm at gmail.com> - 1.6.1-7
  - Add more explicit BuildRequires (RHBZ#913893)