Changeset 352 for spec/trunk/SPECS

Timestamp:

Jul 11, 2013, 1:26:20 AM (12 years ago)

Author:

dmik

Message:

spec: kbuild: 0.1.9998.6-1.

File:

• spec/trunk/SPECS/kbuild.spec (modified) (7 diffs)

spec/trunk/SPECS/kbuild.spec

@@ -3 +3 @@
 #
 # NOTES:
-# 1. Requires GCC 3.3.5 CSD4 (ftp://ftp.netlabs.org/pub/gcc/GCC-3.3.5-csd4.zip)
+# 1. Requires GCC 3.3.5 CSD5 (ftp://ftp.netlabs.org/pub/gcc/GCC-3.3.5-csd5.zip)
 # 2. Build with rpmbuild -ba -D "master_mode 1" when packing a new release
 #    and changing %svn_rev / %svn_url.
@@ -18 +18 @@
 %define ver_patch   9998
 
-%define os2_release 5
+%define os2_release 6
 
 %define rpm_release 1
 
 %define svn_url     http://svn.netlabs.org/repos/kbuild/trunk
-%define svn_rev     2663
-
-%define descr_brief kBuild is a GNU make fork with a set of scripts to simplify\
+%define svn_rev     2687
+
+%define descr_brief kBuild is a GNU Make fork with a set of scripts to simplify\
 complex build tasks and portable versions of various UNIX tools to ensure\
 cross-platform portability.
@@ -45 +45 @@
 Patch4:     kbuild-004-gcc3omf_add_rc_support.patch
 Patch5:     kbuild-005-gcc3omf_gen_implib_for_dll.patch
-Patch6:     kbuild-006-fix-os2-build.patch
 Patch7:     kbuild-007-gcc3omf_add_rc_support-NEW.patch
 
@@ -71 +70 @@
 %docdir %{pkg_docdir}/
 %{_bindir}/*
+%exclude %{_bindir}/make.exe
 %{_datadir}/*
+
+#------------------------------------------------------------------------------
+%package make
+#------------------------------------------------------------------------------
+
+Summary:    GNU Make 3.81 implementation based on kBuild's kmk
+Group:      System Environment/Libraries
+Provides:   make = 3.81
+
+%description make
+A GNU Make executable compiled from the kmk source tree. The kmk tool itself is
+a fork of GNU Make and this build just disables all kmk-specific features. It
+may also contain some minor GNU Make bugfixes not specific to kmk which are
+absent from the upstream version. However, this executable should be fully
+compatible with the vanilla GNU Make function-wise.
+
+%files make
+%defattr(-,root,root,-)
+%{_bindir}/make.exe
 
 #------------------------------------------------------------------------------
@@ -109 +128 @@
 %patch5
 [ $? = 0 ] || exit 1
-%patch6
-[ $? = 0 ] || exit 1
 %patch7
 [ $? = 0 ] || exit 1
@@ -151 +168 @@
 
 # We don't want LIBC*.DLL, there is a separate package for them
-rm "%{buildroot}%{_bindir}/*.dll"
+rm "%{buildroot}%{_bindir}"/*.dll
 
 # Additional docs (not installed by install)
 cp -dp COPYING ChangeLog kBuild/doc/COPYING-FDL-1.3 "%{buildroot}%{pkg_docdir}/"
 
+# To make GNU Make we simply copy kmk_gmake.exe, this should be enough
+cp -dp "%{buildroot}%{_bindir}/kmk_gmake.exe" "%{buildroot}%{_bindir}/make.exe"
+
 #------------------------------------------------------------------------------
 %clean
@@ -164 +184 @@
 #------------------------------------------------------------------------------
 %changelog
+
+* Thu Jul 11 2013 Dmitriy Kuminov <coding@dmik.org> 0.1.9998.6-1
+- New SVN release 2687 of version 0.1.9998.
+- Add kbuild-make package containing vanilla GNU Make executable.
 
 * Mon Nov 5 2012 Dmitriy Kuminov <coding/dmik.org> 0.1.9998.5-1