[kBuild] Update to trunk HEAD version, have a fix for gcc >= 4.7 (http://trac.netlabs.org/kbuild/ticket/112)

[Sérgio Monteiro Basto]

commit 1e160e70ede74cf9560c6d95444a337e0c30360c
Author: Sérgio Basto <sergio at serjux.com>
Date:   Sun May 18 17:09:11 2014 +0100

    Update to trunk HEAD version, have a fix for gcc >= 4.7 (http://trac.netlabs.org/kbuild/ticket/112)
    
    - Drop kBuild-0.1.5-dprintf.patch patch, upstream source also have a fix in their own way.
    - add kBuild-0.1.9998-gl_.patch to fix a regression on compiling in Linux
      (http://trac.netlabs.org/kbuild/ticket/117), partially reverses changeset 2702 .

 .gitignore                |    1 +
 kBuild-0.1.9998-gl_.patch |   11 +++++++++++
 kBuild.spec               |   21 +++++++++++++++------
 sources                   |    2 +-
 4 files changed, 28 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 49a82c0..b179be6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 kBuild-0.1.5-p2-src.tar.gz
 /kBuild-r2537.tar.gz
+/kBuild-r2730.tar.gz
diff --git a/kBuild-0.1.9998-gl_.patch b/kBuild-0.1.9998-gl_.patch
new file mode 100644
index 0000000..14f9f99
--- /dev/null
+++ b/kBuild-0.1.9998-gl_.patch
@@ -0,0 +1,11 @@
+--- ./src/kmk/dir.c.orig	2014-05-18 13:59:01.671557581 +0100
++++ ./src/kmk/dir.c	2014-05-18 14:02:49.611887247 +0100
+@@ -1445,7 +1445,7 @@ dir_setup_glob (glob_t *gl)
+ #ifdef __EMX__ /* The FreeBSD implementation actually uses gl_lstat!! */
+   gl->gl_lstat = local_stat;
+ #endif
+-#ifdef KMK
++#if defined(WINDOWS32) && defined(KMK) 
+   gl->gl_exists = file_exists_p;
+   gl->gl_isdir = dir_exists_p;
+ #endif
diff --git a/kBuild.spec b/kBuild.spec
index b877372..5512d57 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -1,8 +1,8 @@
-%global patchlevel r1
+%global svn_revision r2730
 
 Name:           kBuild
-Version:        0.1.98
-Release:        6%{?patchlevel:.%{patchlevel}}%{?dist}
+Version:        0.1.9998
+Release:        1%{?svn_revision:.%{svn_revision}}%{?dist}
 Summary:        A cross-platform build environment
 
 Group:          Development/Tools
@@ -13,11 +13,12 @@ URL:            http://svn.netlabs.org/kbuild
 #Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}%{?patchlevel:-%{patchlevel}}-src.tar.gz
 # svn co -e2537 http://svn.netlabs.org/repos/kbuild/trunk@2537 kBuild
 # tar czf kBuild-r2537.tar.gz --exclude .svn kBuild
-Source0:        kBuild-r2537.tar.gz
+Source0:        kBuild-%{svn_revision}.tar.gz
 Patch0:         kBuild-0.1.3-escape.patch
 Patch1:         kBuild-0.1.5-dprintf.patch
 Patch2:         kBuild-0.1.5-pthread.patch
 Patch3:         kBuild-0.1.98-arm.patch
+Patch4:         kBuild-0.1.9998-gl_.patch
 
 BuildRequires:  byacc libacl-devel flex
 BuildRequires:  autoconf automake gettext-devel cvs
@@ -36,9 +37,11 @@ repository.
 #%setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}}
 %setup -q -n %{name}
 %patch0 -p1 -b .escape
-%patch1 -p1 -b .dprintf
+#patch1 -p1 -b .dprintf
 %patch2 -p1 -b .pthreads
 %patch3 -p1 -b .arm
+#revert Changeset 2702 for trunk/src/kmk/dir.c
+%patch4 -p1 -b .gl_
 
 # Remove prebuilt stuff
 rm -rf kBuild/bin/*
@@ -48,7 +51,7 @@ rm -rf kBuild/bin/*
 %define bootstrap_mflags %{_smp_mflags} \\\
         CFLAGS="%{optflags}"            \\\
         KBUILD_VERBOSE=2                \\\
-        KBUILD_VERSION_PATCH=999
+        KBUILD_VERSION_PATCH=9998
 
 %define mflags %{bootstrap_mflags}      \\\
         NIX_INSTALL_DIR=%{_prefix}      \\\
@@ -80,6 +83,12 @@ rm -r %{buildroot}%{_docdir}
 
 
 %changelog
+* Sun May 18 2014 Sérgio Basto <sergio at serjux.com> - 0.1.9998-1.r2730
+- Update to trunk HEAD version, have a fix for gcc >= 4.7 (http://trac.netlabs.org/kbuild/ticket/112)
+- Drop kBuild-0.1.5-dprintf.patch patch, upstream source also have a fix in their own way.
+- add kBuild-0.1.9998-gl_.patch to fix a regression on compiling in Linux
+  (http://trac.netlabs.org/kbuild/ticket/117), partially reverses changeset 2702 . 
+
 * Thu Oct 24 2013 Lubomir Rintel <lkundrak at v3.sk> - 0.1.98-6.r1
 - Bulk sad and useless attempt at consistent SPEC file formatting
 - Fix ARM build
diff --git a/sources b/sources
index 1c7950b..93bbc62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4890acabce44bb9c94f1211eca1c135c  kBuild-r2537.tar.gz
+367a7156f98d0cc6cd0da5213e2fa679  kBuild-r2730.tar.gz