From 236c0228b092f399488148b167272c5eb566f823 Mon Sep 17 00:00:00 2001
From: gil <puntogil@libero.it>
Date: Aug 05 2013 15:10:15 +0000
Subject: rebuilt rhbz#992193


---

diff --git a/maven-jaxb2-plugin.spec b/maven-jaxb2-plugin.spec
index 5dbbcf8..2354b28 100644
--- a/maven-jaxb2-plugin.spec
+++ b/maven-jaxb2-plugin.spec
@@ -1,37 +1,24 @@
-Name: maven-jaxb2-plugin
-Version: 0.8.1
-Release: 10%{?dist}
-Summary: Provides the capability to generate java sources from schemas
-Group: Development/Libraries
-License: BSD and ASL 2.0
-URL: http://java.net/projects/maven-jaxb2-plugin/pages/Home
-
+Name:          maven-jaxb2-plugin
+Version:       0.8.1
+Release:       11%{?dist}
+Summary:       Provides the capability to generate java sources from schemas
+License:       BSD and ASL 2.0
+URL:           http://java.net/projects/maven-jaxb2-plugin/pages/Home
 # svn export https://svn.java.net/svn/maven-jaxb2-plugin~svn/tags/0.8.1/ maven-jaxb2-plugin-0.8.1
 # tar -zcvf maven-jaxb2-plugin-0.8.1.tar.gz maven-jaxb2-plugin-0.8.1
-Source0: %{name}-%{version}.tar.gz
-
+Source0:       %{name}-%{version}.tar.gz
 # Don't try to use an internal bundled resolver, as this is not available in
 # Fedora:
-Patch0: %{name}-dont-use-internal-resolver.patch
-
-# Build only version 2.2:
-Patch1: %{name}-build-2.2-only.patch
-
+Patch0:        %{name}-dont-use-internal-resolver.patch
 # Adapt for Maven 3:
-Patch2: %{name}-adapt-for-maven-3.patch
-
-# Add dependency on codemodel:
-Patch3: %{name}-add-codemodel-dependency.patch
-
+Patch1:        %{name}-adapt-for-maven-3.patch
 # Remove the enconding option as the version of the XJC compiler that we build
 # in Fedora doesn't have it:
-Patch4: %{name}-remove-enconding-option.patch
-
-BuildArch: noarch
+Patch2:        %{name}-remove-enconding-option.patch
 
+BuildArch:     noarch
 BuildRequires: java
 BuildRequires: maven-local
-BuildRequires: jpackage-utils
 BuildRequires: xml-commons-resolver
 BuildRequires: maven-enforcer-plugin
 BuildRequires: maven-surefire-provider-junit4
@@ -39,77 +26,48 @@ BuildRequires: maven-anno-plugin
 BuildRequires: glassfish-jaxb
 BuildRequires: codemodel
 
-Requires: codemodel
-Requires: glassfish-jaxb
-Requires: java
-Requires: maven
-Requires: jpackage-utils
-Requires: xml-commons-resolver
-Requires: maven-anno-plugin
-
-
 %description
 This Maven 2 plugin wraps the JAXB 2.x XJC compiler and provides the capability
 to generate Java sources from XML Schemas.
 
-
 %package javadoc
 Summary: API documentation for %{name}
-Group: Documentation
-Requires: jpackage-utils
-
 
 %description javadoc
 The API documentation of %{name}.
 
-
 %prep
 %setup -q
 %patch0 -p1
+# Build only version 2.2
+%pom_disable_module plugin-2.0
+%pom_disable_module plugin-2.1
+%pom_disable_module plugin
+%pom_disable_module testing
 %patch1 -p1
+# Add dependency on codemodel:
+%pom_add_dep com.sun.codemodel:codemodel:2.6 plugin-2.2
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-
 
 %build
-mvn-rpmbuild install javadoc:aggregate 
 
+%mvn_file :maven-jaxb22-plugin %{name}
+%mvn_file :%{name}-core %{name}-core
+%mvn_build
 
 %install
+%mvn_install
 
-# Jar files:
-install -d -m 755 %{buildroot}%{_javadir}
-install -Dpm 644 plugin-2.2/target/maven-jaxb22-plugin-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-install -Dpm 644 plugin-core/target/maven-jaxb2-plugin-core-%{version}.jar %{buildroot}%{_javadir}/%{name}-core.jar
-
-# POM files:
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-project.pom
-install -Dpm 644 plugin-2.2/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-install -Dpm 644 plugin-core/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-core.pom
-
-# Dependencies map:
-%add_maven_depmap JPP-%{name}-project.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-%add_maven_depmap JPP-%{name}-core.pom %{name}-core.jar
-
-# Javadoc files:
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/.
-
-
-%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-
-
-%files javadoc
-%doc %{_javadocdir}/%{name}
+%files -f .mfiles
 
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Mon Aug 05 2013 gil cattaneo <puntogil@libero.it> 0.8.1-11
+- rebuilt rhbz#992193
+- swith to Xmvn
+- adapt to new guideline
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild