Changeset 254 for spec/trunk/SPECS

Timestamp:

Dec 18, 2011, 11:52:47 PM (14 years ago)

Author:

dmik

Message:

odin: Update spec to the latest version used before switch to GCC.

This was in the trunk before merging with gcc-kmk.

File:

• spec/trunk/SPECS/odin/odin.spec (modified) (8 diffs)

spec/trunk/SPECS/odin/odin.spec

@@ -9 +9 @@
 %define ver_patch   1
 
-%define rpm_release 1
+%define rpm_release 3
 
 Name:       odin
@@ -124 +124 @@
 export ODIN_BINDIR_D="$(echo %{odin_bindir} | sed -re 's,/@unixroot,'$UNIXROOT',g' -e 's,/,\\,g')"
 %cube {ADDSTRING ";%ODIN_BINDIR_D%" IN "SET PATH=" (FIRST AFTER} %{os2_config_sys} >nul
-CFGSYS_CHANGED=y
 %endif
 if [ -n "$CFGSYS_CHANGED" ]; then
@@ -143 +142 @@
 mkdir -p "$(echo %{odin_windowsdir} | sed -re 's,/@unixroot,'$UNIXROOT',g')"
 (cd "%{odin_systemdir}/"; "%{odin_systemdir}"/odininst.exe)
+ODIN_SYSTEMDIR_D="$(echo %{odin_systemdir} | sed -re 's,/@unixroot,'$UNIXROOT',g' -e 's,/,\\,g')"
+rexxtry.cmd 1>nul 2>nul <<EOF
+call rxfuncadd SysIni, rexxutil, SysIni
+call SysIni 'USER', 'KLIBC', 'OdinPath', '$ODIN_SYSTEMDIR_D'||'00'x
+exit
+EOF
 
 %postun -n lib%{name}
 
-CFGSYS_CHANGED=
-%if "%{odin_bindir}" != "%{_bindir}"
-export ODIN_BINDIR_D="$(echo %{odin_bindir} | sed -re 's,/@unixroot,'$UNIXROOT',g' -e 's,/,\\,g')"
-%cube {DELSTRING ";%ODIN_BINDIR_D%" IN "SET PATH=" (FIRST} %{os2_config_sys} >nul
-CFGSYS_CHANGED=y
-%endif
-%if "%{odin_systemdir}" != "%{_libdir}"
-export ODIN_SYSTEMDIR_D="$(echo %{odin_systemdir} | sed -re 's,/@unixroot,'$UNIXROOT',g' -e 's,/,\\,g')"
-%cube {DELSTRING ";%ODIN_SYSTEMDIR_D%" IN "LIBPATH=" (FIRST} %{os2_config_sys} >nul
-CFGSYS_CHANGED=y
-%endif
-if [ -n "$CFGSYS_CHANGED" ]; then
-    echo; echo "NOTE:"
-    echo; echo "The file '%{os2_config_sys}' has been changed. You need to reboot your"
-    echo "computer in order to activate these changes."
-    echo
+if [ "$1" -eq 0 ]; then # (upon removal)
+    rexxtry.cmd 1>nul 2>nul <<EOF
+call rxfuncadd SysIni, rexxutil, SysIni
+call SysIni 'USER', 'KLIBC', 'OdinPath', 'DELETE:'
+exit
+EOF
+
+    CFGSYS_CHANGED=
+    %if "%{odin_bindir}" != "%{_bindir}"
+    export ODIN_BINDIR_D="$(echo %{odin_bindir} | sed -re 's,/@unixroot,'$UNIXROOT',g' -e 's,/,\\,g')"
+    %cube {DELSTRING ";%ODIN_BINDIR_D%" IN "SET PATH=" (FIRST} %{os2_config_sys} >nul
+    CFGSYS_CHANGED=y
+    %endif
+    %if "%{odin_systemdir}" != "%{_libdir}"
+    export ODIN_SYSTEMDIR_D="$(echo %{odin_systemdir} | sed -re 's,/@unixroot,'$UNIXROOT',g' -e 's,/,\\,g')"
+    %cube {DELSTRING ";%ODIN_SYSTEMDIR_D%" IN "LIBPATH=" (FIRST} %{os2_config_sys} >nul
+    %endif
+    if [ -n "$CFGSYS_CHANGED" ]; then
+        echo; echo "NOTE:"
+        echo; echo "The file '%{os2_config_sys}' has been changed. You need to reboot your"
+        echo "computer in order to activate these changes."
+        echo
+    fi
 fi
 
@@ -270 +282 @@
 
 %postun win32k
-export ODIN_SYSTEMDIR_D="$(echo %{odin_systemdir} | sed -re 's,/@unixroot,'$UNIXROOT',g' -e 's,/,\\,g')"
-%cube {DELLINE "DEVICE=%ODIN_SYSTEMDIR_D%\win32k.sys"} %{os2_config_sys} >nul
-echo; echo "NOTE:"
-echo; echo "The file '%{os2_config_sys}' has been changed. You need to reboot your"
-echo "computer in order to activate these changes."
-echo
+if [ "$1" -eq 0 ]; then # (upon removal)
+    export ODIN_SYSTEMDIR_D="$(echo %{odin_systemdir} | sed -re 's,/@unixroot,'$UNIXROOT',g' -e 's,/,\\,g')"
+    %cube {DELLINE "DEVICE=%ODIN_SYSTEMDIR_D%\win32k.sys"} %{os2_config_sys} >nul
+    echo; echo "NOTE:"
+    echo; echo "The file '%{os2_config_sys}' has been changed. You need to reboot your"
+    echo "computer in order to activate these changes."
+    echo
+fi
 
 #------------------------------------------------------------------------------
@@ -297 +311 @@
 
 %post doc
+if [ "$1" -ge 1 ]; then # (upon update)
+    %wps_object_delete_all -n %{name}-doc
+fi
 %wps_object_create_begin -n %{name}-doc
 %{pkg_wps_folder_create}
@@ -307 +324 @@
 
 %postun doc
-%wps_object_delete_all -n %{name}-doc
+if [ "$1" -eq 0 ]; then # (upon removal)
+    %wps_object_delete_all -n %{name}-doc
+fi
 
 #------------------------------------------------------------------------------
@@ -341 +360 @@
 mkdir -p %{buildroot}%{odin_systemdir}/
 cp -dp system32/*.dll %{buildroot}%{odin_systemdir}/
-cp -dp system32/*.exe %{buildroot}%{odin_systemdir}/
 cp -dp system32/win32k.sys %{buildroot}%{odin_systemdir}/
 
 mkdir -p %{buildroot}%{odin_bindir}/
-cp system32/*.exe %{buildroot}%{odin_bindir}/
+cp -dp system32/*.exe %{buildroot}%{odin_bindir}/
 
 # these are internal tools that should not be in PATH
@@ -363 +381 @@
 %changelog
 
+* Mon Oct 03 2011 Dmitriy Kuminov <coding/dmik.org> - 0.7.1-3
+- Remove executables from "libodin" (they are provided by "odin-exe-tools").
+
+* Sun Oct 02 2011 Dmitriy Kuminov <coding/dmik.org> - 0.7.1-2
+- Add "KLIBC\OdinPath" to OS2.INI needed for some applications.
+- Fix unexpected deletion of WPS objects when updating the "odin-doc" package
+  ("yum reinstall odin-doc" is still requred after updating to this version).
+
 * Fri Sep 30 2011 Dmitriy Kuminov <coding/dmik.org> - 0.7.1-1
 - New release 0.7.1. See %{pkg_docdir}/ChangeLog for more information.