[dcm4che-test] Update to fix FTBFS.

[Ankur Sinha]

commit 4baf40562b1dfaa0e2f808c7903d36f0b39923f2
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur at gmail.com>
Date:   Sun Aug 18 20:16:55 2013 +1000

    Update to fix FTBFS.
    
    Thanks Gil!
    
    RHBZ 992114

 dcm4che-test.spec |   67 +++++++++++-----------------------------------------
 1 files changed, 14 insertions(+), 53 deletions(-)
---
diff --git a/dcm4che-test.spec b/dcm4che-test.spec
index 1a2aa29..e09fe35 100644
--- a/dcm4che-test.spec
+++ b/dcm4che-test.spec
@@ -3,89 +3,50 @@
 
 Name:           dcm4che-test
 Version:        2.6
-Release:        0.7%{?dist}.20110530svn%{svn_rev}
+Release:        0.8%{?dist}.20110530svn%{svn_rev}
 Summary:        Test images for dcm4che2
-
 License:        MPLv1.1 or GPLv2 or LGPLv2
 URL:            http://www.dcm4che.org/confluence/display/proj/The+Project
 BuildArch:      noarch
-
 # Generated from an svn checkout:
 # svn export svn://svn.code.sf.net/p/dcm4che/svn/dcm4che2-test/tags/dcm4che2-test-2.6
 # tar -cvJf dcm4che2-test-2.6.tar.xz dcm4che2-test-2.6/
 Source0:        dcm4che2-test-%{version}.tar.xz
 
-BuildRequires:    jpackage-utils
 BuildRequires:    java-devel
 BuildRequires:    maven-local
-BuildRequires:    maven-compiler-plugin
-BuildRequires:    maven-install-plugin
-BuildRequires:    maven-jar-plugin
-BuildRequires:    maven-javadoc-plugin
-BuildRequires:    maven-release-plugin
-BuildRequires:    maven-resources-plugin
-BuildRequires:    maven-surefire-plugin
-
-Requires:       jpackage-utils
-Requires:       java
-
-Requires(post):       jpackage-utils
-Requires(postun):     jpackage-utils
 
 %description
 DCM4CHE Test Data and Libraries
 
 %package javadoc
 Summary:        Javadocs for %{name}
-Group:          Documentation
-Requires:       jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n dcm4che2-test-2.6
+%setup -q -n dcm4che2-test-%{version}
 
 %build
-mvn-rpmbuild -X install javadoc:aggregate 
-
-%install
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p  %{name}-image/target/%{name}-image-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-image.jar
-
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/ $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml  \
-        $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%mvn_file :%{name}-image %{name}-image
+%mvn_build -X -- -Dproject.build.sourceEncoding=UTF-8
+rm -rf target/site/apidocs/javadoc.sh
 
-install -pm 644 %{name}-image/pom.xml \
-        $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-image.pom
-
-# note that the artifact id is %%{name}-image, not dcm4che2-test-image
-%add_to_maven_depmap org.dcm4che.test %{name}-image %{version} JPP %{name}-image
-
-# Check on this: there is no jar for the -test pom, do we need a add_to_maven_depmap here?
-%add_to_maven_depmap org.dcm4che.test dcm4che2-test %{version} JPP %{name}
-
-find $RPM_BUILD_ROOT%{_javadocdir}/%{name} -name "javadoc.sh" -exec chmod a-x '{}' \;
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%install
+%mvn_install
 
-%files
-%{_mavenpomdir}/*.pom
-%{_mavendepmapfragdir}/%{name}
-%{_javadir}/%{name}-image.jar
+%files -f .mfiles
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Sun Aug 18 2013 gil cattaneo <puntogil at libero.it> 2.6-0.8.20110530svn15516
+- fix rhbz#992114
+- switch to XMvn
+- adapt to current guideline
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6-0.7.20110530svn15516
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild