rpms/kBuild/EL-6 import.log, NONE, 1.1 kBuild-0.1.5-pthread.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 kBuild.spec, 1.9, 1.10 sources, 1.5, 1.6

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/kBuild/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13504/EL-6

Modified Files:
	.cvsignore kBuild.spec sources 
Added Files:
	import.log kBuild-0.1.5-pthread.patch 
Log Message:
Pull from devel


--- NEW FILE import.log ---
kBuild-0_1_5-6_p2_fc14:EL-6:kBuild-0.1.5-6.p2.fc14.src.rpm:1278621903

kBuild-0.1.5-pthread.patch:
 Config.kmk |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE kBuild-0.1.5-pthread.patch ---
diff -up kBuild-0.1.5-p1/Config.kmk.pthreads kBuild-0.1.5-p1/Config.kmk
--- kBuild-0.1.5-p1/Config.kmk.pthreads	2010-02-18 08:27:24.287688965 +0100
+++ kBuild-0.1.5-p1/Config.kmk	2010-02-18 08:28:07.505493345 +0100
@@ -282,6 +282,8 @@ ifndef TEMPLATE_BIN_TOOL
  endif
  ifeq ($(KBUILD_TARGET),linux)
   TEMPLATE_BIN_LIBS            += rt
+  TEMPLATE_BIN_LIBS            += pthread
+  TEMPLATE_BIN_LDFLAGS         += -Wl,--as-needed
  endif
   TEMPLATE_BIN_CFLAGS.x86      += -m32
   TEMPLATE_BIN_CFLAGS.sparc32  += -m32


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/EL-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 Apr 2009 06:11:34 -0000	1.5
+++ .cvsignore	8 Jul 2010 20:45:26 -0000	1.6
@@ -1 +1 @@
-kBuild-0.1.5-p1-src.tar.gz
+kBuild-0.1.5-p2-src.tar.gz


Index: kBuild.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/EL-6/kBuild.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- kBuild.spec	25 Jul 2009 04:16:05 -0000	1.9
+++ kBuild.spec	8 Jul 2010 20:45:26 -0000	1.10
@@ -1,4 +1,4 @@
-%global patchlevel p1
+%global patchlevel p2
 
 Name:           kBuild
 Version:        0.1.5
@@ -13,6 +13,7 @@ URL:            http://svn.netlabs.org/k
 Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}%{?patchlevel:-%{patchlevel}}-src.tar.gz
 Patch0:         kBuild-0.1.3-escape.patch
 Patch1:         kBuild-0.1.5-dprintf.patch
+Patch2:         kBuild-0.1.5-pthread.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  byacc libacl-devel flex 
@@ -32,6 +33,7 @@ repository.
 %setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}}
 %patch0 -p1 -b .escape
 %patch1 -p1 -b .dprintf
+%patch2 -p1 -b .pthreads
 
 # Remove prebuilt stuff
 rm -rf kBuild/bin/*
@@ -51,6 +53,7 @@ rm -rf kBuild/bin/*
 # The bootstrap would probably not be needed if we depended on ourselves,
 # yet it is not guarranteed that new versions are compilable with older
 # kmk versions, so with this we are on a safer side
+find -name config.log -delete
 kBuild/env.sh --full make -f bootstrap.gmk %{bootstrap_mflags}
 
 kBuild/env.sh kmk %{mflags} rebuild
@@ -77,6 +80,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Feb 17 2010 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-6.p2
+- Fix build
+- Update to later patch level
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.5-6.p1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/EL-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	25 Apr 2009 06:11:34 -0000	1.5
+++ sources	8 Jul 2010 20:45:26 -0000	1.6
@@ -1 +1 @@
-148f821c0f9e729a1f65bc91e69f6e7a  kBuild-0.1.5-p1-src.tar.gz
+5e4e2193aa6cb3f095af2f99bf90d01d  kBuild-0.1.5-p2-src.tar.gz