[glite-jobid-api-java] EPEL 7 support, switch to java-headless (#RB 1068106).

[František Dvořák]

commit 6cc40196b07597070949a780ea093dc0e26304ce
Author: František Dvořák <valtri at civ.zcu.cz>
Date:   Mon Feb 24 01:03:16 2014 +0100

    EPEL 7 support, switch to java-headless (#RB 1068106).

 glite-jobid-api-java.spec |   23 ++++++++---
 pom.patch                 |   98 ---------------------------------------------
 2 files changed, 17 insertions(+), 104 deletions(-)
---
diff --git a/glite-jobid-api-java.spec b/glite-jobid-api-java.spec
index db5c3a4..3f00e18 100644
--- a/glite-jobid-api-java.spec
+++ b/glite-jobid-api-java.spec
@@ -1,9 +1,10 @@
 %global groupId     org.glite
 %global artifactId  jobid-api-java
+%{!?_mavenpomdir: %global _mavenpomdir %{_datadir}/maven2/poms}
 
 Name:           glite-jobid-api-java
 Version:        1.3.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        JAVA implementation of handling gLite jobid
 
 License:        ASL 2.0
@@ -13,19 +14,23 @@ Source:         http://scientific.zcu.cz/emi/emi.jobid.api-java/%{name}-%{versio
 BuildArch:      noarch
 BuildRequires:  ant
 BuildRequires:  jakarta-commons-codec
-BuildRequires:  jpackage-utils
 BuildRequires:  perl
 BuildRequires:  perl(Getopt::Long)
 BuildRequires:  perl(POSIX)
-%if 0%{?fedora} >= 18
+%if 0%{?rhel} >= 7 || 0%{?fedora}
 BuildRequires:  maven-local
 %else
 BuildRequires:  java-devel
+BuildRequires:  jpackage-utils
 %endif
 Requires:       jakarta-commons-codec
+%if 0%{?rhel} >= 7 || 0%{?fedora} >= 20
+Requires:       java-headless
+%else
 Requires:       java
+%endif
+%if 0%{?rhel} <= 6 && ! 0%{?fedora}
 Requires:       jpackage-utils
-%if 0%{?rhel} || 0%{?fedora} < 18
 Requires(post): jpackage-utils
 Requires(postun): jpackage-utils
 %endif
@@ -37,7 +42,9 @@ JAVA implementation of library handling gLite jobid.
 %package        javadoc
 Summary:        Java API documentation for %{name}
 Requires:       %{name} = %{version}-%{release}
+%if 0%{?rhel} <= 6 && ! 0%{?fedora}
 Requires:       jpackage-utils
+%endif
 
 %description    javadoc
 This package contains java API documentation for java implementation of gLite
@@ -66,13 +73,13 @@ install -m 0644 JPP-%{name}.pom $RPM_BUILD_ROOT%{_mavenpomdir}
 %endif
 
 
-%if 0%{?rhel} || 0%{?fedora} < 18
+%if 0%{?rhel} <= 6 && ! 0%{?fedora}
 %post
 %update_maven_depmap
 %endif
 
 
-%if 0%{?rhel} || 0%{?fedora} < 18
+%if 0%{?rhel} <= 6 && ! 0%{?fedora}
 %postun
 %update_maven_depmap
 %endif
@@ -89,6 +96,10 @@ install -m 0644 JPP-%{name}.pom $RPM_BUILD_ROOT%{_mavenpomdir}
 
 
 %changelog
+* Sun Feb 23 2014 František Dvořák <valtri at civ.zcu.cz> - 1.3.7-2
+- EPEL 7 support
+- Switch to java-headless (RB #1068106)
+
 * Fri Nov 22 2013 František Dvořák <valtri at civ.zcu.cz> - 1.3.7-1
 - New release 1.3.7 (L&B 4.0.12)
 - Pom file patch not needed anymore