[jss/f18] Fixed build issue on F18

[Endi Sukma Dewata]

commit 6aceb784abe08d4ada6eec4a61c039f2e4106103
Author: Endi S. Dewata <edewata at redhat.com>
Date:   Wed Jul 17 15:16:32 2013 -0400

    Fixed build issue on F18

 jss-fixed-build-issue-on-F17-or-newer.patch |   23 +++++++++++++++++++++++
 jss.spec                                    |    9 +++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/jss-fixed-build-issue-on-F17-or-newer.patch b/jss-fixed-build-issue-on-F17-or-newer.patch
new file mode 100644
index 0000000..59c83f2
--- /dev/null
+++ b/jss-fixed-build-issue-on-F17-or-newer.patch
@@ -0,0 +1,23 @@
+diff -rupN jss-4.2.6.orig/mozilla/security/coreconf/config.mk jss-4.2.6/mozilla/security/coreconf/config.mk
+--- jss-4.2.6.orig/mozilla/security/coreconf/config.mk	2007-05-03 23:54:05.000000000 -0700
++++ jss-4.2.6/mozilla/security/coreconf/config.mk	2013-07-22 19:14:46.000000000 -0700
+@@ -68,8 +68,19 @@ TARGET_OSES = FreeBSD BSD_OS NetBSD Open
+ ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
+ include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
+ else
++ifeq ($(OS_TARGET), Linux)
++OS_RELEASE_VER_MAJOR := $(shell echo $(OS_RELEASE) | cut -f1 -d.)
++OS_RELEASE_VER_MINOR := $(shell echo $(OS_RELEASE) | cut -f2 -d.)
++OS_RELEASE_GT_2_6 := $(shell [ $(OS_RELEASE_VER_MAJOR) -ge 2 -o \( $(OS_RELEASE_VER_MAJOR) -eq 2 -a $(OS_RELEASE_VER_MINOR) -ge 6 \) ] && echo true)
++ifeq ($(OS_RELEASE_GT_2_6),true)
++include $(CORE_DEPTH)/coreconf/Linux2.6.mk
++else
+ include $(CORE_DEPTH)/coreconf/$(OS_TARGET)$(OS_RELEASE).mk
+ endif
++else
++include $(CORE_DEPTH)/coreconf/$(OS_TARGET)$(OS_RELEASE).mk
++endif
++endif
+
+ #######################################################################
+ # [4.0] Master "Core Components" source and release <platform> tags   #
diff --git a/jss.spec b/jss.spec
index 33cae5b..c3de5e5 100644
--- a/jss.spec
+++ b/jss.spec
@@ -1,6 +1,6 @@
 Name:           jss
 Version:        4.2.6
-Release:        27%{?dist}
+Release:        28%{?dist}
 Summary:        Java Security Services (JSS)
 
 Group:          System Environment/Libraries
@@ -44,6 +44,7 @@ Patch19:        jss-HSM-manufacturerID.patch
 Patch20:        jss-ECC-Phase2KeyArchivalRecovery.patch
 Patch21:        jss-undo-JCA-deprecations.patch
 Patch22:        jss-undo-BadPaddingException-deprecation.patch
+Patch23:        jss-fixed-build-issue-on-F17-or-newer.patch
 
 
 %description
@@ -83,6 +84,7 @@ This package contains the API documentation for JSS.
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 %build
 [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
@@ -187,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 17 2013 Nathan Kinder <nkinder at redhat.com> - 4.2.6-28
+- Bugzilla Bug #847120 - Unable to build JSS on F17 or newer
+
 * Wed Dec 12 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 4.2.6-27
 - Simple rebuild
 
@@ -344,5 +349,5 @@ rm -rf $RPM_BUILD_ROOT
 - Added RPM_OPT_FLAGS to XCFLAGS
 - Added link to Sun JCE information
 
-* Mon Feb 27 2007 Rob Crittenden <rcritten at redhat.com> 4.2.4-1
+* Tue Feb 27 2007 Rob Crittenden <rcritten at redhat.com> 4.2.4-1
 - Initial build