From dc34d72939f3274897093b3aa0073c0a34c59c2b27248b0b7d1ab4a74d0ca0d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Fri, 28 Nov 2014 07:58:47 +0000 Subject: [PATCH] Accepting request 261957 from home:Ledest:bashisms fix bashism in add.modules script OBS-URL: https://build.opensuse.org/request/show/261957 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/Modules?expand=0&rev=21 --- Modules.changes | 7 +++++++ Modules.spec | 2 ++ modules-3.2.10-fix-bashisms.patch | 12 ++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 modules-3.2.10-fix-bashisms.patch diff --git a/Modules.changes b/Modules.changes index f1ff86b..402ff43 100644 --- a/Modules.changes +++ b/Modules.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Nov 16 20:50:00 UTC 2014 - Led + +- fix bashism in add.modules script +- add patches: + * modules-3.2.10-fix-bashisms.patch + ------------------------------------------------------------------- Tue Aug 26 10:50:58 UTC 2014 - jengelh@inai.de diff --git a/Modules.spec b/Modules.spec index ecc4594..6e89a4f 100644 --- a/Modules.spec +++ b/Modules.spec @@ -32,6 +32,7 @@ Source: modules-%{version}.tar.bz2 Patch0: share.patch # PATCH-FIX-UPSTREAM return.patch Patch1: return.patch +Patch2: modules-3.2.10-fix-bashisms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: environment-modules Obsoletes: environment-modules < %{version} @@ -61,6 +62,7 @@ Authors: %setup -q -n modules-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build # Remove overzealous use of "dnl" (+++), which caused diff --git a/modules-3.2.10-fix-bashisms.patch b/modules-3.2.10-fix-bashisms.patch new file mode 100644 index 0000000..8b272ab --- /dev/null +++ b/modules-3.2.10-fix-bashisms.patch @@ -0,0 +1,12 @@ +diff -Ndur modules-3.2.10/etc/add.modules.in modules-3.2.10-fix-bashisms/etc/add.modules.in +--- modules-3.2.10/etc/add.modules.in 2012-11-02 00:22:06.000000000 +0200 ++++ modules-3.2.10-fix-bashisms/etc/add.modules.in 2014-11-16 22:48:55.863380526 +0200 +@@ -114,7 +114,7 @@ + findload $1.old + /bin/cat > $1 <