Changeset 1210 for spec/trunk/SPECS

Timestamp:

Jul 30, 2017, 3:44:13 PM (8 years ago)

Author:

dmik

Message:

spec: odin: Release version 0.9.0-1.

Location:

spec/trunk/SPECS

Files:

• odin (deleted)
• odin.spec (copied) (copied from spec/trunk/SPECS/odin/odin.spec ) (20 diffs)

spec/trunk/SPECS/odin.spec

@@ -1 @@
-#
-# http://svn.netlabs.org/odin32
-#
-
 %define test_mode   0
 
 %define ver_major   0
-%define ver_minor   8
-%define ver_patch   9
+%define ver_minor   9
+%define ver_patch   0
 
 %define rpm_release 1
@@ -19 +15 @@
 Release:    %{rpm_release}
 
-Source:     %{name}-%{version}.zip
+%scm_source svn http://svn.netlabs.org/repos/odin32/tags/%{version} 22145
 
 %define descr_brief Odin is a set of libraries that provide a Win32-compatible runtime environment.\
@@ -25 +21 @@
 native OS/2 applications built from Win32 sources using Odin SDK.
 
-%define pkg_docdir      %{_docdir}/%{name}
+%define pkg_docdir      %{_docdir}/%{name}-%{version}
 
 %define pkg_wps_base            ODIN
@@ -41 +37 @@
 %define odin_bindir     %{_bindir}
 %define odin_systemdir  %{odin_libdir}
+%define odin_sysexedir  %{_libdir}/odin
 %define odin_windowsdir %{_var}/lib/odin
-
-# disable lxlite compression (this causes problems for some DLLs)
-%define __os_install_post   %{nil}
 
 #------------------------------------------------------------------------------
@@ -60 +54 @@
 the main package to exist.
 
+BuildRequires: kbuild
+BuildRequires: os2tk45-headers os2tk45-rc os2tk45-utils
+
 #------------------------------------------------------------------------------
 %package -n lib%{name}
@@ -67 +64 @@
 Group:      System Environment/Libraries
 
+# For os2_dos_path, os2_langdir etc. macros
+Requires: os2-rpm >= 0-4
+# For -e in scriptlets
+Requires: rpm >= 4.9
+
 %description -n lib%{name}
 %{descr_brief}
@@ -73 +75 @@
 
 %files -n lib%{name}
-%defattr(-,root,root,-)
 %doc %{pkg_docdir}/
 %exclude %{pkg_docdir}/odinuser.inf
@@ -80 +81 @@
 %endif
 %if "%{odin_bindir}" != "%{_bindir}"
-%{odin_bindir}/
-%else
+%dir %{odin_bindir}/
+%endif
 %{odin_bindir}/*.exe
-%endif
 %exclude %{odin_bindir}/pe.exe
 %exclude %{odin_bindir}/pec.exe
 %exclude %{odin_bindir}/xx2lx.exe
 %if "%{odin_systemdir}" != "%{odin_libdir}"
-%{odin_systemdir}/
-%else
-%{odin_systemdir}/*
-%endif
+%dir %{odin_systemdir}/
+%endif
+%{odin_systemdir}/*.dll
 %exclude %{odin_systemdir}/capi2032.dll
 %exclude %{odin_systemdir}/secur32.dll
 %exclude %{odin_systemdir}/schannel.dll
+%dir %{odin_sysexedir}/
+%{odin_sysexedir}/*.exe
 %if 0%{?have_win32k}
 %exclude %{odin_systemdir}/win32k.sys
-%exclude %{odin_systemdir}/win32kCC.exe
-%exclude %{odin_systemdir}/kRx.exe
+%exclude %{odin_sysexedir}/win32kCC.exe
+%exclude %{odin_sysexedir}/kRx.exe
 %endif
 # files/directories generated by odininst.exe removed on uninstall
-%attr(0755,root,root) %ghost %{odin_systemdir}/Drivers/
-%attr(0755,root,root) %ghost %{odin_systemdir}/Drivers/etc/
-%attr(0644,root,root) %ghost %{odin_systemdir}/ODIN.INI
+%ghost %{odin_systemdir}/Drivers/
+%ghost %{odin_systemdir}/Drivers/etc/
+%ghost %{odin_systemdir}/ODIN.INI
 # files/directories generated by odininst.exe preserved on uninstall
-%attr(0755,root,root) %ghost %config %{odin_windowsdir}/
+%ghost %config %{odin_windowsdir}/
 
 %pre -n lib%{name}
@@ -115 +116 @@
 %warpin_conflicts_end
 
-%post -n lib%{name}
-
-ODIN_SYSTEMDIR_D="$(echo %{odin_systemdir} | sed -re 's,/@unixroot,'$UNIXROOT',g' -e 's,/,\\,g')"
-ODIN_BINDIR_D="$(echo %{odin_bindir} | sed -re 's,/@unixroot,'$UNIXROOT',g' -e 's,/,\\,g')"
-
-CFGSYS_CHANGED=
+%post -n lib%{name} -e
+
+ODIN_SYSTEMDIR_D="%%{os2_expand_dos_vars %{os2_dos_path %{odin_systemdir}}}"
+ODIN_BINDIR_D="%%{os2_expand_dos_vars %{os2_dos_path %{odin_bindir}}}"
+
 %if "%{odin_systemdir}" != "%{_libdir}"
 export ODIN_SYSTEMDIR_D
 %cube {ADDSTRING ";%ODIN_SYSTEMDIR_D%" IN "LIBPATH=" (FIRST AFTER} %{os2_config_sys} >nul
-CFGSYS_CHANGED=y
 %endif
 %if "%{odin_bindir}" != "%{_bindir}"
 export ODIN_BINDIR_D
 %cube {ADDSTRING ";%ODIN_BINDIR_D%" IN "SET PATH=" (FIRST AFTER} %{os2_config_sys} >nul
-CFGSYS_CHANGED=y
-%endif
-if [ -n "$CFGSYS_CHANGED" ]; then
-    echo; echo "NOTE:"
-    echo; echo "The boot configuration has been changed. You need to reboot your"
-    echo "computer in order to activate these changes."
-    echo
-fi
-
-#initialize system directories, registry and INI files
-ODIN_WINDOWSDIR_D=$(echo "%{odin_windowsdir}" | sed -re 's,/@unixroot,'$UNIXROOT',g' -e 's,/,\\,g')
-echo \
-"[DEVDIRECTORIES]
+%endif
+
+# initialize system directories, registry and INI files
+
+ODIN_WINDOWSDIR_D="%%{os2_expand_dos_vars %{os2_dos_path %{odin_windowsdir}}}"
+cat > "%{odin_systemdir}/ODIN.INI" <<EOF
+[DEVDIRECTORIES]
 WINDOWS=$ODIN_WINDOWSDIR_D
-" \
-> "%{odin_systemdir}/ODIN.INI"
-echo \
-"[ODINSYSTEM]
-PE_EXE=$ODIN_BINDIR_D\\PE.EXE
-PEC_EXE=$ODIN_BINDIR_D\\PEC.EXE
-W16ODIN_EXE=$ODIN_BINDIR_D\\W16ODIN.EXE
-" \
->> "%{odin_systemdir}/ODIN.INI"
-# mkdir -p fails on /@unixroot, replace it with the real value
-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')"
+
+[ODINSYSTEM]
+PE_EXE=$ODIN_BINDIR_D\PE.EXE
+PEC_EXE=$ODIN_BINDIR_D\PEC.EXE
+W16ODIN_EXE=$ODIN_BINDIR_D\W16ODIN.EXE
+EOF
+
+%%{__mkdir_p} %{odin_windowsdir}
+(cd "%{odin_systemdir}/"; "%{odin_sysexedir}"/odininst.exe)
+
 rexxtry.cmd 1>nul 2>nul <<EOF
 call rxfuncadd SysIni, rexxutil, SysIni
@@ -162 +152 @@
 EOF
 
-%postun -n lib%{name}
+%postun -n lib%{name} -e
 
 if [ "$1" -eq 0 ]; then # (upon removal)
-    rexxtry.cmd 1>nul 2>nul <<EOF
+  rexxtry.cmd 1>nul 2>nul <<EOF
 call rxfuncadd SysIni, rexxutil, SysIni
 call SysIni 'USER', 'KLIBC', 'OdinPath', 'DELETE:'
@@ -171 +161 @@
 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 boot configuration has been changed. You need to reboot your"
-        echo "computer in order to activate these changes."
-        echo
-    fi
+%if "%{odin_bindir}" != "%{_bindir}"
+  export ODIN_BINDIR_D="%%{os2_expand_dos_vars %{os2_dos_path %{odin_bindir}}}"
+  %cube {DELSTRING ";%ODIN_BINDIR_D%" IN "SET PATH=" (FIRST} %{os2_config_sys} >nul
+%endif
+%if "%{odin_systemdir}" != "%{_libdir}"
+  export ODIN_SYSTEMDIR_D="%%{os2_expand_dos_vars %{os2_dos_path %{odin_systemdir}}}"
+  %cube {DELSTRING ";%ODIN_SYSTEMDIR_D%" IN "LIBPATH=" (FIRST} %{os2_config_sys} >nul
+%endif
 fi
 
@@ -210 +192 @@
 
 %files -n lib%{name}-capi20
-%defattr(-,root,root,-)
 %{odin_systemdir}/capi2032.dll
 
@@ -234 +215 @@
 
 %files -n lib%{name}-security
-%defattr(-,root,root,-)
 %{odin_systemdir}/secur32.dll
+%{odin_systemdir}/schannel.dll
 
 #------------------------------------------------------------------------------
@@ -256 +237 @@
 
 %files exe-tools
-%defattr(-,root,root,-)
 %{odin_bindir}/pe.exe
 %{odin_bindir}/pec.exe
@@ -283 +263 @@
 
 %files win32k
-%defattr(-,root,root,-)
 %{odin_systemdir}/win32k.sys
-%{odin_systemdir}/win32kCC.exe
-%{odin_systemdir}/kRx.exe
-
-%post win32k
-export ODIN_SYSTEMDIR_D="$(echo %{odin_systemdir} | sed -re 's,/@unixroot,'$UNIXROOT',g' -e 's,/,\\,g')"
+%{odin_sysexedir}/win32kCC.exe
+%{odin_sysexedir}/kRx.exe
+
+%post win32k -e
+export ODIN_SYSTEMDIR_D="%%{os2_expand_dos_vars %{os2_dos_path %{odin_systemdir}}}"
 %cube {ADDLINE "DEVICE=%ODIN_SYSTEMDIR_D%\win32k.sys" (AFTER "DEVICE="} %{os2_config_sys} >nul
-echo; echo "NOTE:"
-echo; echo "The boot configuration has been changed. You need to reboot your"
-echo "computer in order to activate these changes."
-echo
-
-%postun win32k
+
+%postun win32k -e
 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 boot configuration has been changed. You need to reboot your"
-    echo "computer in order to activate these changes."
-    echo
+  export ODIN_SYSTEMDIR_D="%%{os2_expand_dos_vars %{os2_dos_path %{odin_systemdir}}}"
+  %cube {DELLINE "DEVICE=%ODIN_SYSTEMDIR_D%\win32k.sys"} %{os2_config_sys} >nul
 fi
 
@@ -329 +300 @@
 %post doc
 if [ "$1" -ge 1 ]; then # (upon update)
-    %wps_object_delete_all -n %{name}-doc
+  %wps_object_delete_all -n %{name}-doc
 fi
 %wps_object_create_begin -n %{name}-doc
@@ -342 +313 @@
 %postun doc
 if [ "$1" -eq 0 ]; then # (upon removal)
-    %wps_object_delete_all -n %{name}-doc
+  %wps_object_delete_all -n %{name}-doc
 fi
 
 #------------------------------------------------------------------------------
+# Note: Odin exception handler wants .sym and won't read .dbg files so we supply
+# the list of files for the debug package in debugfiles.list ourselves (below).
+%define _strip_opts --no-debuginfo
+%debug_package
+#------------------------------------------------------------------------------
+
+#------------------------------------------------------------------------------
 %prep
 #------------------------------------------------------------------------------
 
-%if 0%{?test_mode}
-%setup -TD
-%else
-# @todo move the zip to the right place!
-%setup -q
-%endif
+%scm_setup
 
 #------------------------------------------------------------------------------
@@ -360 +333 @@
 #------------------------------------------------------------------------------
 
+%define kmk_env \\\
+  CFLAGS="%{optflags}" \\\
+  CXXFLAGS="%{optflags}" \\\
+  PATH_INS=%{buildroot}/ \\\
+  INST_BIN=%{odin_bindir}/ \\\
+  INST_LIB=%{odin_libdir}/ \\\
+  INST_DLL=%{odin_systemdir}/ \\\
+  INST_DEBUG=./
+
+kmk %{?_smp_mflags} %{kmk_env}
+
 #------------------------------------------------------------------------------
 %install
 #------------------------------------------------------------------------------
 
-rm -rf %{buildroot}
-
-mkdir -p %{buildroot}%{pkg_docdir}
-cp *.txt %{buildroot}%{pkg_docdir}/
-cp LICENSE.TXT %{buildroot}%{pkg_docdir}/
-cp ChangeLog %{buildroot}%{pkg_docdir}/
-cp WGSS50.lic %{buildroot}%{pkg_docdir}/
-cp odinuser.inf %{buildroot}%{pkg_docdir}/
-
-mkdir -p %{buildroot}%{odin_windowsdir}/
-
-mkdir -p %{buildroot}%{odin_systemdir}/
-cp -dp system32/*.dll %{buildroot}%{odin_systemdir}/
+%{__rm} -rf %{buildroot}
+
+kmk install %{kmk_env}
+
+%{__mkdir_p} %{buildroot}%{pkg_docdir}
+%{__cp} -a \
+  doc/Logging.txt \
+  doc/Odin.ini.txt \
+  doc/Readme.txt \
+  doc/ReportingBugs.txt \
+  doc/odinuser.inf \
+  LICENSE.TXT \
+  ChangeLog \
+  WGSS50.lic \
+  %{buildroot}%{pkg_docdir}/
+
+%{__mkdir_p} %{buildroot}%{odin_windowsdir}/
+
+%{__mkdir_p} %{buildroot}%{odin_sysexedir}/
+
+# these are internal tools that should not be in PATH
+%{__mv} %{buildroot}%{odin_bindir}/odininst.* %{buildroot}%{odin_sysexedir}/
 %if 0%{?have_win32k}
-cp -dp system32/win32k.sys %{buildroot}%{odin_systemdir}/
-%endif
-
-mkdir -p %{buildroot}%{odin_bindir}/
-cp -dp system32/*.exe %{buildroot}%{odin_bindir}/
-
-# these are internal tools that should not be in PATH
-mv %{buildroot}%{odin_bindir}/odininst.exe %{buildroot}%{odin_systemdir}/
-%if 0%{?have_win32k}
-mv %{buildroot}%{odin_bindir}/win32kCC.exe %{buildroot}%{odin_systemdir}/
-mv %{buildroot}%{odin_bindir}/kRx.exe %{buildroot}%{odin_systemdir}/
-%endif
+%{__mv} %{buildroot}%{odin_bindir}/win32kCC.* %{buildroot}%{odin_sysexedir}/
+%{__mv} %{buildroot}%{odin_bindir}/kRx.* %{buildroot}%{odin_sysexedir}/
+%endif
+
+# wgss
+%{__cp} -a bin/wgss50.* %{buildroot}%{odin_systemdir}/
+
+# we don't need static libraries
+%{__rm} %{buildroot}%{odin_libdir}/*.lib
+
+# list all .sym files for debug_package ourselves (see note above)
+%{__rm} -f debugfiles.list
+for f in `find %{buildroot} -name *.sym` ; do
+  echo ${f#%{buildroot}} >> debugfiles.list
+done
 
 #------------------------------------------------------------------------------
@@ -396 +392 @@
 
 %if !0%{?test_mode}
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 %endif
 
 #------------------------------------------------------------------------------
 %changelog
+* Sun Jul 30 2017 Dmitriy Kuminov <coding@dmik.org> - 0.9.0-1
+- New release 0.9.0. See %{pkg_docdir}/ChangeLog for more information.
+- Update SPEC to use latest OS/2 RPM environment guidelines (scm_source etc.)
+  which includes building Odin from sources rather than using zipped binaries
+  when building RPMs and also makes RPM a primary distribution format for Odin.
+- Add schannel.dll to odin-security sub-package.
 
 * Sun Feb 17 2013 Dmitriy Kuminov <coding/dmik.org> - 0.8.9-1
-- <List changes here>
+- New release 0.8.9. See %{pkg_docdir}/ChangeLog for more information.
 
 * Mon Dec 31 2012 Dmitriy Kuminov <coding/dmik.org> - 0.8.8-1
@@ -420 +422 @@
 - New release 0.8.4. See %{pkg_docdir}/ChangeLog for more information.
 
-* Mon Feb 07 2012 Dmitriy Kuminov <coding/dmik.org> - 0.8.3-1
+* Tue Feb 07 2012 Dmitriy Kuminov <coding/dmik.org> - 0.8.3-1
 - New release 0.8.3. See %{pkg_docdir}/ChangeLog for more information.