Attachment 615532 Details for Bug 847120 – spec file changes to discover Linux major.minor versions (in patch form)

[patch] spec file changes to discover Linux major.minor versions (in patch form)

jss_spec_bug_847120.patch (text/plain), 2.33 KB, created by Elio Maldonado Batiz on 2012-09-21 17:26:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2012-09-21 17:26:26 UTC

Size: 2.33 KB

patch

obsolete

>diff --git a/jss.spec b/jss.spec
>index f97a497..c3fa2fb 100644
>--- a/jss.spec
>+++ b/jss.spec
>@@ -1,6 +1,6 @@
> Name:           jss
> Version:        4.2.6
>-Release:        25%{?dist}
>+Release:        26%{?dist}
> Summary:        Java Security Services (JSS)
> 
> Group:          System Environment/Libraries
>@@ -117,12 +117,29 @@ USE_64=1
> export USE_64
> %endif
> 
>-%if 0%{?fedora} >= 16
>-cp -p mozilla/security/coreconf/Linux2.6.mk mozilla/security/coreconf/Linux3.1.mk 
>-sed -i -e 's;LINUX2_1;LINUX3_1;' mozilla/security/coreconf/Linux3.1.mk
>+# This copying and adjustements of the LinuxX.Y.mk files is temporary. It should
>+# be removed once jss rebases to latest upstream version with a cleaner coreconf.
>+
>+# Discover the Linux{Major}.{Minor} versions
>+MAJOR=`uname -a | awk '{ print $3 }' | awk -F '-' '{ print $1 }' | awk -F '.' '{ print $1 }'`
>+MINOR=`uname -a | awk '{ print $3 }' | awk -F '-' '{ print $1 }' | awk -F '.' '{ print $2 }'`
>+
>+%if 0%{?fedora} >= 18
>+  cp -p mozilla/security/coreconf/Linux2.6.mk mozilla/security/coreconf/Linux${MAJOR}.${MINOR}.mk 
>+  sed -i -e 's;LINUX2_1;LINUX3_1;' mozilla/security/coreconf/Linux${MAJOR}.${MINOR}.mk
>+%else
>+  %if 0%{?fedora} == 17
>+    cp -p mozilla/security/coreconf/Linux2.6.mk mozilla/security/coreconf/Linux${MAJOR}.${MINOR}.mk 
>+    sed -i -e 's;LINUX2_1;LINUX3_1;' mozilla/security/coreconf/Linux${MAJOR}.${MINOR}.mk
>+    %endif
>+%else
>+  %if 0%{?fedora} >= 16
>+    cp -p mozilla/security/coreconf/Linux2.6.mk mozilla/security/coreconf/Linux3.1.mk 
>+    sed -i -e 's;LINUX2_1;LINUX3_1;' mozilla/security/coreconf/Linux3.1.mk
> 
>-cp -p mozilla/security/coreconf/Linux3.1.mk mozilla/security/coreconf/Linux3.2.mk 
>-sed -i -e 's;LINUX3_1;LINUX3_2;' mozilla/security/coreconf/Linux3.2.mk
>+    cp -p mozilla/security/coreconf/Linux3.1.mk mozilla/security/coreconf/Linux3.2.mk 
>+    sed -i -e 's;LINUX3_1;LINUX3_2;' mozilla/security/coreconf/Linux3.2.mk
>+ %endif
> %endif
> 
> # The Makefile is not thread-safe
>@@ -184,6 +201,10 @@ rm -rf $RPM_BUILD_ROOT
> 
> 
> %changelog
>+* Fri Sep 21 2012 Elio Maldonado <emaldona@redhat.com> - 4.2.6-26
>+- Resolves: rhbz#847120 - JSS doesn't build on F-17
>+- Discover on the fly the Linux major and minor versions for f17 and higher
>+
> * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.6-25
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
>

Flags:

emaldona: review? (cfu)

Actions: View | Diff

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