Attachment 774954 Details for Bug 847120 – 0001-Fixed-build-issue-on-F18.patch

[patch] 0001-Fixed-build-issue-on-F18.patch

0001-Fixed-build-issue-on-F18.patch (text/plain), 3.20 KB, created by Endi Sukma Dewata on 2013-07-17 20:39:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Endi Sukma Dewata

Created: 2013-07-17 20:39:47 UTC

Size: 3.20 KB

patch

obsolete

>From 0422ceaafcc5206c728047ad76a77f73a3b9d7bf Mon Sep 17 00:00:00 2001
>From: "Endi S. Dewata" <edewata@redhat.com>
>Date: Wed, 17 Jul 2013 15:16:32 -0400
>Subject: [PATCH] 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(-)
> create mode 100644 jss-fixed-build-issue-on-F17-or-newer.patch
>
>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 0000000000000000000000000000000000000000..b3775ee441ff46f3d5513b24c3f40dfdc2b3bba9
>--- /dev/null
>+++ b/jss-fixed-build-issue-on-F17-or-newer.patch
>@@ -0,0 +1,23 @@
>+diff -ENwbur jss.orig/mozilla/security/coreconf/config.mk jss/mozilla/security/coreconf/config.mk
>+--- jss.orig/mozilla/security/coreconf/config.mk	2013-07-11 23:52:41.000000000 -0400
>++++ jss/mozilla/security/coreconf/config.mk	2013-07-17 14:58:10.000000000 -0400
>+@@ -68,8 +68,19 @@
>+ 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 33cae5b992b7cb3b4f94333cf328b19f3d20dc91..f6067b41cfa3758f6e722c4cfe9991408f07b568 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 Feb 17 2013 Nathan Kinder <nkinder@redhat.com> - 4.2.6-28
>+- Bugzilla Bug #847120 - Unable to build JSS on F17 or newer
>+
> * Wed Dec 12 2012 Stanislav Ochotnicky <sochotnicky@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@redhat.com> 4.2.4-1
>+* Tue Feb 27 2007 Rob Crittenden <rcritten@redhat.com> 4.2.4-1
> - Initial build
>-- 
>1.8.1.4
>

Actions: View | Diff

Attachments on bug 847120: 614610 | 615532 | 774954 | 774955 | 777141 | 777143 | 777144 | 777145