robert pushed to mksh (el5). "Merge remote branch 'origin/master' into el5"

notifications at fedoraproject.org notifications at fedoraproject.org
Sun Apr 19 22:53:50 UTC 2015


>From e69cd6406b7748185a854e01a35fa3f17013165a Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert at fedoraproject.org>
Date: Thu, 19 Mar 2015 23:59:38 +0100
Subject: RHBZ #922974 affects Fedora >= 19 and RHEL >= 7


diff --git a/mksh.spec b/mksh.spec
index 4fa3943..d5dd0ac 100644
--- a/mksh.spec
+++ b/mksh.spec
@@ -64,14 +64,14 @@ EOF
 
 %build
 # Work around RHBZ #922974 on Fedora 19 and later
-%if 0%{?fedora} >= 19
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
 CFLAGS="$RPM_OPT_FLAGS -DMKSH_DISABLE_EXPERIMENTAL" sh Build.sh -r
 %else
 CFLAGS="$RPM_OPT_FLAGS -DMKSH_DISABLE_EXPERIMENTAL" sh Build.sh -r -c lto
 %endif
 cp test.sh test_mksh.sh
 # Work around RHBZ #922974 on Fedora 19 and later
-%if 0%{?fedora} >= 19
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
 CFLAGS="$RPM_OPT_FLAGS -DMKSH_DISABLE_EXPERIMENTAL" sh Build.sh -L -r
 %else
 CFLAGS="$RPM_OPT_FLAGS -DMKSH_DISABLE_EXPERIMENTAL" sh Build.sh -L -r -c lto
-- 
cgit v0.10.2


>From 12242fbd6e8cb091c2bfbcfbe5d4c31134a7c373 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert at fedoraproject.org>
Date: Mon, 20 Apr 2015 00:46:43 +0200
Subject: Upgrade to 50f


diff --git a/mksh.spec b/mksh.spec
index d5dd0ac..4b6b4a5 100644
--- a/mksh.spec
+++ b/mksh.spec
@@ -4,7 +4,7 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          50e
+Version:          50f
 Release:          1%{?dist}
 # BSD (setmode.c), ISC (strlcpy.c), MirOS (the rest)
 License:          MirOS and ISC and BSD
@@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/lksh.1*
 
 %changelog
+* Mon Apr 20 2015 Robert Scheck <robert at fedoraproject.org> 50f-1
+- Upgrade to 50f
+
 * Thu Mar 19 2015 Robert Scheck <robert at fedoraproject.org> 50e-1
 - Upgrade to 50e
 - Apply https://fedoraproject.org/wiki/Features/UsrMove
diff --git a/sources b/sources
index cafa88c..6558fbb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5f0bd21e64aabef4ac64d95a95e1b727  mksh-R50e.tgz
+c3bdd668992e7369165910f0902fa854  mksh-R50f.tgz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mksh.git/commit/?h=el5&id=770b8515f5c42b659b9facd8b881529d146f853a


More information about the scm-commits mailing list