[jacorb] Switch to xmvn

[Marek Goldmann]

commit 575ec2ff12bd51b8c40b7175b27d2f0e2171c21e
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Wed Jul 9 12:04:30 2014 +0200

    Switch to xmvn

 JDK8-support.patch |   26 ++++++++++++++++++++++++++
 jacorb.spec        |   52 ++++++++++++++++++----------------------------------
 2 files changed, 44 insertions(+), 34 deletions(-)
---
diff --git a/JDK8-support.patch b/JDK8-support.patch
new file mode 100644
index 0000000..026c828
--- /dev/null
+++ b/JDK8-support.patch
@@ -0,0 +1,26 @@
+From f038592a60a50cdf263875c6ebc440a322f1c543 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <marek.goldmann at gmail.com>
+Date: Mon, 7 Jul 2014 12:43:24 +0200
+Subject: [PATCH] JDK8 support
+
+---
+ src/org/jacorb/security/sas/GSSUPCredentialSpi.java | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/org/jacorb/security/sas/GSSUPCredentialSpi.java b/src/org/jacorb/security/sas/GSSUPCredentialSpi.java
+index efc8833..da5cb4c 100644
+--- a/src/org/jacorb/security/sas/GSSUPCredentialSpi.java
++++ b/src/org/jacorb/security/sas/GSSUPCredentialSpi.java
+@@ -97,4 +97,9 @@ public final class GSSUPCredentialSpi implements GSSCredentialSpi
+     {
+         return myMechOid;
+     }
++
++    public GSSCredentialSpi impersonate(GSSNameSpi name) throws GSSException
++    {
++        throw new GSSException(GSSException.FAILURE, -1, "Not supported yet");
++    }
+ }
+-- 
+1.9.3
+
diff --git a/jacorb.spec b/jacorb.spec
index add7b06..dc59a59 100644
--- a/jacorb.spec
+++ b/jacorb.spec
@@ -1,6 +1,6 @@
 Name:             jacorb
 Version:          2.3.1
-Release:          11%{?dist}
+Release:          12%{?dist}
 Summary:          The Java implementation of the OMG's CORBA standard
 Group:            Development/Libraries
 License:          LGPLv2
@@ -34,21 +34,18 @@ Patch4:           jacorb-2.3.1-primaddress_port.patch
 # to "skip" valid boolean values, as those are not padded.
 Patch5:           jacorb-2.3.1-read_boolean.patch
 
+# Support for JDK 8
+Patch6:           JDK8-support.patch
+
 BuildArch:        noarch
 
-BuildRequires:    jpackage-utils
+BuildRequires:    javapackages-local
 BuildRequires:    java-devel
 BuildRequires:    ant
 BuildRequires:    antlr-tool
 BuildRequires:    avalon-logkit
 BuildRequires:    slf4j
 
-Requires:         jpackage-utils
-Requires:         antlr-tool
-Requires:         avalon-logkit
-Requires:         slf4j
-Requires:         bsh
-
 %description
 This package contains the Java implementation of the OMG's CORBA standard
 
@@ -77,6 +74,7 @@ find -name '*.zip' -exec rm -f '{}' \;
 %patch3 -p0
 %patch4 -p0
 %patch5 -p0
+%patch6 -p1
 
 # No xdoclet available
 sed -i 's|,notification||' src/org/jacorb/build.xml
@@ -97,37 +95,23 @@ sed -i "s|>avalon<|>avalon-logkit<|g" jacorb-idl-compiler.pom
 ant all doc
 
 %install
-# JAR
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/
-install -pm 644 lib/jacorb.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-install -pm 644 lib/idl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-idl-compiler.jar
-
-# POM
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 jacorb-parent.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-parent.pom
-install -pm 644 jacorb.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-install -pm 644 jacorb-idl-compiler.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-idl-compiler.pom
-
-# DEPMAP
-%add_maven_depmap JPP-%{name}-parent.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "jacorb:jacorb"
-%add_maven_depmap JPP-%{name}-idl-compiler.pom %{name}-idl-compiler.jar -a "jacorb:jacorb-idl-compiler,jacorb:idl"
-
-# APIDOCS
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
+%mvn_artifact jacorb-parent.pom
+%mvn_artifact jacorb.pom lib/jacorb.jar
+%mvn_artifact jacorb-idl-compiler.pom lib/idl.jar
+
+%mvn_install -J doc/api
+
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 %doc doc/LICENSE
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc doc/LICENSE
 
 %changelog
+* Wed Jul 09 2014 Marek Goldmann <mgoldman at redhat.com> - 2.3.1-12
+- Switch to xmvn
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild