Changeset 1386 for spec/trunk/SPECS/os2-base.spec

Timestamp:

Apr 23, 2018, 5:02:54 PM (7 years ago)

Author:

dmik

Message:

spec: os2-base: Release version 0.0.0-18.

File:

• spec/trunk/SPECS/os2-base.spec (modified) (4 diffs)

spec/trunk/SPECS/os2-base.spec

@@ -3 +3 @@
 Name: os2-base
 Version: 0.0.0
-Release: 17%{?dist}
+Release: 18%{?dist}
 
 License: free
 
 Requires: os2-release
-Requires: os2-rpm >= 0-4
+
+# For os2_expand_unixroot
+BuildRequires: os2-rpm >= 1-2
+Requires: os2-rpm >= 1-2
 
 Provides: ansicall.dll
@@ -294 +297 @@
 
 
-%post
+%post -e
 if [ "$1" = 1 ] ; then
 #execute only on first install
@@ -304 +307 @@
 %cube {ADDLINE "SET TERM=os2" (IFNOT "SET TERM=")} c:\config.sys > NUL
 %cube {ADDLINE "REM [ Default shell values ]" (IFNOT "REM [ Default shell values ]")} c:\config.sys > NUL
-%cube {ADDLINE "SET SHELL=%{os2_dos_path %{_bindir}/sh.exe}" (IFNOT "SET SHELL=")} c:\config.sys > NUL
-%cube {ADDLINE "SET EMXSHELL=%{os2_dos_path %{_bindir}/sh.exe}" (IFNOT "SET EMXSHELL=")} c:\config.sys > NUL
-%cube {ADDLINE "SET CONFIG_SHELL=%{os2_dos_path %{_bindir}/sh.exe}" (IFNOT "SET CONFIG_SHELL=")} c:\config.sys > NUL
-%cube {ADDLINE "SET MAKESHELL=%{os2_dos_path %{_bindir}/sh.exe}" (IFNOT "SET MAKESHELL=")} c:\config.sys > NUL
-%cube {ADDLINE "SET EXECSHELL=%{os2_dos_path %{_bindir}/sh.exe}" (IFNOT "SET EXECSHELL=")} c:\config.sys > NUL
+%cube {ADDLINE "SET SHELL=%%{os2_expand_unixroot %%{_bindir}/sh.exe}" (IFNOT "SET SHELL=")} c:\config.sys > NUL
+%cube {ADDLINE "SET EMXSHELL=%%{os2_expand_unixroot %%{_bindir}/sh.exe}" (IFNOT "SET EMXSHELL=")} c:\config.sys > NUL
+%cube {ADDLINE "SET CONFIG_SHELL=%%{os2_expand_unixroot %%{_bindir}/sh.exe}" (IFNOT "SET CONFIG_SHELL=")} c:\config.sys > NUL
+%cube {ADDLINE "SET MAKESHELL=%%{os2_expand_unixroot %%{_bindir}/sh.exe}" (IFNOT "SET MAKESHELL=")} c:\config.sys > NUL
+%cube {ADDLINE "SET EXECSHELL=%%{os2_expand_unixroot %%{_bindir}/sh.exe}" (IFNOT "SET EXECSHELL=")} c:\config.sys > NUL
 %cube {ADDLINE "REM [ Temporary directory ]" (IFNOT "REM [ Temporary directory ]")} c:\config.sys > NUL
 %cube {ADDLINE "SET TMP=%{os2_dos_path /@unixroot/var/tmp}" (IFNOT "SET TMP=")} c:\config.sys > NUL
@@ -354 +357 @@
 
 %changelog
+* Mon Apr 23 2018 Dmitriy Kuminov <coding@dmik.org> 0.0.0-18
+- Make sure SHELL/EMXSHELL and friends in CONFIG.SYS use forward slashes.
+
 * Fri Jul 28 2017 Dmitriy Kuminov <coding@dmik.org> 0.0.0-17
 - Use handy os2_dos_path, os2_langdir etc. macros from os2-rpm.