[geronimo-validation] fix rhbz#992345

[gil]

commit 7e6bafdfc06008395ff23638b13b2b845776d072
Author: gil <puntogil at libero.it>
Date:   Mon Aug 19 15:57:46 2013 +0200

    fix rhbz#992345

 geronimo-validation-build.patch |   20 -----------------
 geronimo-validation.spec        |   45 ++++++++++++++++----------------------
 2 files changed, 19 insertions(+), 46 deletions(-)
---
diff --git a/geronimo-validation.spec b/geronimo-validation.spec
index ed86652..ccd8cdd 100644
--- a/geronimo-validation.spec
+++ b/geronimo-validation.spec
@@ -3,26 +3,21 @@
 
 Name:           geronimo-validation
 Version:        1.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Geronimo implementation of JSR 303
-Group:          Development/Libraries
 License:        ASL 2.0
+# should be http://geronimo.apache.org/
 URL:            http://apache.org/
 # svn export https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-validation_1.0_spec-1.1/
 # tar caf geronimo-validation_1.0_spec-1.1.tar.xz geronimo-validation_1.0_spec-1.1
 Source0:        %{spec_name}-%{version}.tar.xz
-Patch0:         %{name}-build.patch
 BuildArch:      noarch
 
-BuildRequires:  jpackage-utils
 BuildRequires:  maven-local
-BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  geronimo-parent-poms
 BuildRequires:  geronimo-osgi-support
-Requires:       jpackage-utils
-Requires:       java >= 1.6.0
 
 %description
 This is the Geronimo implementation of JSR-303, the Bean
@@ -30,41 +25,39 @@ Validation API specification.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Requires:       jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
 
 %prep
 %setup -q -n %{spec_name}-%{version}
-%patch0 -p1
+%pom_xpath_set "pom:project/pom:parent/pom:groupId" org.apache.geronimo.specs
+%pom_xpath_set "pom:project/pom:parent/pom:artifactId" specs
+%pom_xpath_set "pom:project/pom:parent/pom:version" 1.4
+%pom_xpath_inject "pom:project/pom:parent" "<relativePath>../pom.xml</relativePath>"
+%pom_xpath_set "pom:project/pom:packaging" jar
 
 %build
-mvn-rpmbuild install javadoc:aggregate
+
+%mvn_file : %{name}
+%mvn_alias : "javax.validation:validation-api"
+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
 
 %install
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
-install -pm 0644 target/%{spec_name}-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-install -d -m 0755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 0644 pom.xml \
-        $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom 
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a javax.validation:validation-api
-
-%files
+%mvn_install
+
+%files -f .mfiles
 %doc LICENSE NOTICE
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-%{_javadir}/%{name}.jar
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
-%{_javadocdir}/%{name}
 
 %changelog
+* Sat Aug 17 2013 gil cattaneo <puntogil at libero.it> 1.1-9
+- fix rhbz#992345
+- use pom macros
+- minor changes to adapt to current guideline
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild