Changeset 493

Timestamp:

Jan 9, 2015, 3:33:23 PM (11 years ago)

Author:

Yuri Dario

Message:

spec: libc, added new SafeDos* wrappers from trunk r3942 and r3943, added emxomfstrip binary from trunk, update to libc 0.6.6-csd6, added omf libraries.

File:

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

spec/trunk/SPECS/libc.spec

@@ -7 +7 @@
 Group:          System/Libraries
 Version:        0.6.6
-Release:        21%{?dist}
+Release:        22%{?dist}
 Url:            http://svn.netlabs.org/libc
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         libc-%{version}.zip
-#Source1:        libc-emxomf.zip
+Source1:        libc-emxomf.zip
 Patch0:         libc.patch
 
@@ -18 +18 @@
 # needs to be done to the stock LIBC 0.6 source in order to build
 # emxomf.exe contained in libc-emxomf.zip 
-#Patch101:       libc-dmik-emxomf-02-remove-asterisk.diff
-#Patch102:       libc-yuri-emxomf-verbose-warnings-3.patch
-#Patch103:       libc-steven-emxomf-index-too-large.diff
+Patch101:       libc-dmik-emxomf-02-remove-asterisk.diff
+Patch102:       libc-yuri-emxomf-verbose-warnings-3.patch
 
 BuildRequires:  rexx_exe
@@ -73 +72 @@
 
 %prep
-%setup -q -c
+%setup -q -c -a 1
 %patch0 
 
@@ -81 +80 @@
 mkdir -p %{buildroot}%{_includedir}
 mkdir -p %{buildroot}%{_libdir}
-#mkdir -p %{buildroot}%{_usr}/i386-pc-os2-elf
-#mkdir -p %{buildroot}%{_usr}/i386-pc-os2-emx
 mkdir -p %{buildroot}%{_usr}/man
 mkdir -p %{buildroot}%{_usr}/info
@@ -88 +85 @@
 cp -p -r usr/bin/* %{buildroot}%{_bindir}
 cp -p -r usr/include/* %{buildroot}%{_includedir}
-#cp -p -r emxomf.exe %{buildroot}%{_bindir}
 cp -p -r usr/lib/* %{buildroot}%{_libdir}
-#cp -p -r usr/man/* %{buildroot}%{_usr}/i386-pc-os2-elf
-#cp -p -r usr/man/* %{buildroot}%{_usr}/i386-pc-os2-emx
 cp -p -r usr/man/* %{buildroot}%{_usr}/man
 cp -p -r usr/man/* %{buildroot}%{_usr}/info
 
+# add new files
+cp -p -r emxomf.exe %{buildroot}%{_bindir}
+cp -p -r emxomfstrip.exe %{buildroot}%{_bindir}
+cp -p -r os2safe.h %{buildroot}%{_includedir}
+cp -p -r libos2.a %{buildroot}%{_libdir}
+
 #remove (old) binutils headers/libs
-rm -f %{buildroot}%{_includedir}/ansidecl.h
+#rm -f %{buildroot}%{_includedir}/ansidecl.h
 rm -f %{buildroot}%{_includedir}/bfd.h
 rm -f %{buildroot}%{_includedir}/bfdlink.h
@@ -107 +107 @@
 rm -f %{buildroot}%{_libdir}/libstdc++.*
 rm -f %{buildroot}%{_libdir}/libsupc++.*
+rm -f %{buildroot}%{_libdir}/libiberty.*
 
 rexx2vio $RPM_BUILD_ROOT%{_bindir}/dllar.cmd $RPM_BUILD_ROOT%{_bindir}/dllar.exe
@@ -129 +130 @@
 %{_bindir}
 %exclude %{_bindir}/*.dbg
-#%{_usr}/i386-pc-os2-elf
-#%{_usr}/i386-pc-os2-emx
 %{_includedir}
 %exclude %{_includedir}/db.h
@@ -155 +154 @@
 
 %changelog
+* Thu Jan 09 2015 yd
+- added new SafeDos* wrappers from trunk r3942 and r3943.
+- added emxomfstrip binary from trunk.
+
 * Tue Jan 06 2015 yd
 - update to libc 0.6.6-csd6, added omf libraries.