rpms/kBuild/F-9 .cvsignore, 1.3, 1.4 kBuild.spec, 1.2, 1.3 sources, 1.3, 1.4 kBuild-0.1.5-revert2027.patch, 1.1, NONE

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/kBuild/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv956/F-9

Modified Files:
	.cvsignore kBuild.spec sources 
Removed Files:
	kBuild-0.1.5-revert2027.patch 
Log Message:
Update branches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Dec 2008 20:48:16 -0000	1.3
+++ .cvsignore	24 Jan 2009 13:30:14 -0000	1.4
@@ -1 +1 @@
-kBuild.tar.gz
+kBuild-0.1.5-src.tar.gz


Index: kBuild.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/F-9/kBuild.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kBuild.spec	30 Dec 2008 20:48:16 -0000	1.2
+++ kBuild.spec	24 Jan 2009 13:30:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           kBuild
 Version:        0.1.5
-Release:        0.1.20081106svn%{?dist}
+Release:        1%{?dist}
 Summary:        A cross-platform build enviroment
 
 Group:          Development/Tools
@@ -8,16 +8,8 @@
 # most tools are from NetBSD, some are from FreeBSD,
 # and make and sed are from GNU
 URL:            http://svn.netlabs.org/kbuild
-#Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}-src.tar.gz
-# Revision 2058 is of the most recent file of VirtualBox OSE-bundled kBuild
-# where the version was determinable. More recent trunk as of end of 2008 won't
-# build, and latest stable can't build VirtualBox OSE
-# svn export -r2058 http://svn.netlabs.org/repos/kbuild@2058 kBuild
-# tar czf kBuild.tar.gz kBuild
-Source0:        %{name}.tar.gz
+Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}-src.tar.gz
 Patch0:         kBuild-0.1.3-escape.patch
-# Revert it, or add <assert.h> include? -- that is the question.
-Patch1:         kBuild-0.1.5-revert2027.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  byacc libacl-devel flex 
@@ -29,36 +21,43 @@
 complex tasks and portable versions of various UNIX tools to
 ensure cross-platform portability.
 
+It is used mainly to build VirtualBox OSE packages for RPM Fusion
+repository.
+
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1 -b .escape
-%patch1 -p0 -b .revert2027
 
 # Remove prebuilt stuff
 rm -rf kBuild/bin/*
 
 
 %build
-# Unset hardcoded optimizations
-%define mflags CFLAGS="%{optflags}" %{_smp_mflags}
-
-# This is so that we see what's being done,
-# i.e. if the compiler flags are in effect
-export KBUILD_VERBOSE=2
+%define bootstrap_mflags %{_smp_mflags} \\\
+        CFLAGS="%{optflags}"            \\\
+        KBUILD_VERBOSE=2
+
+%define mflags %{bootstrap_mflags}      \\\
+        NIX_INSTALL_DIR=%{_prefix}      \\\
+        BUILD_TYPE=release              \\\
+        MY_INST_MODE=0644               \\\
+        MY_INST_BIN_MODE=0755
 
 # 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
-kBuild/env.sh --full make -f bootstrap.gmk %{mflags}
+kBuild/env.sh --full make -f bootstrap.gmk %{bootstrap_mflags}
 
-kBuild/env.sh kmk NIX_INSTALL_DIR=%{_prefix} BUILD_TYPE=release %{mflags} rebuild
+kBuild/env.sh kmk %{mflags} rebuild
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-kBuild/env.sh kmk NIX_INSTALL_DIR=%{_prefix} BUILD_TYPE=release PATH_INS=$RPM_BUILD_ROOT %{mflags} install
-cp -a kBuild/units $RPM_BUILD_ROOT/%{_datadir}/kBuild
+export KBUILD_VERBOSE=2
+kBuild/env.sh kmk %{mflags} PATH_INS=$RPM_BUILD_ROOT install
+# These are included later in files section
+rm -r $RPM_BUILD_ROOT%{_docdir}
 
 
 %clean
@@ -66,13 +65,17 @@
 
 
 %files
-%defattr(0644,root,root,0755)
-%doc COPYING ChangeLog
-%attr(0755,root,root) %{_bindir}/*
+%defattr(-,root,root,-)
+%{_bindir}/*
 %{_datadir}/*
+%doc COPYING ChangeLog
+%doc kBuild/doc/COPYING-FDL-1.3 kBuild/doc/QuickReference*
 
 
 %changelog
+* Sat Jan 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-1
+- Update to new upstream release
+
 * Tue Dec 30 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-0.1.20081106svn
 - Update to build VirtualBox OSE 2.1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Dec 2008 20:48:16 -0000	1.3
+++ sources	24 Jan 2009 13:30:14 -0000	1.4
@@ -1 +1 @@
-54ec45538cc644a3a2843a0e0618eaf1  kBuild.tar.gz
+df7e0905232e67728643f97d63cbf3f3  kBuild-0.1.5-src.tar.gz


--- kBuild-0.1.5-revert2027.patch DELETED ---