From 493b35312b0074c1b6cd8bae68389bd61219ce748e0c3372e3802f3f9f0cf33c Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 26 Sep 2008 12:57:02 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbuild?expand=0&rev=5 --- kbuild-0.1.2svn1599.tar.bz2 | 3 --- kbuild-0.1.3svn1785.tar.bz2 | 3 +++ kbuild-dummy_noreturn.diff | 13 ++++++++++ kbuild-r1599_KBUILD_SVN_INFO_KMK-fix.diff | 10 -------- kbuild.changes | 21 ++++++++++++++++ kbuild.spec | 30 +++++++++++++++++------ 6 files changed, 60 insertions(+), 20 deletions(-) delete mode 100644 kbuild-0.1.2svn1599.tar.bz2 create mode 100644 kbuild-0.1.3svn1785.tar.bz2 create mode 100644 kbuild-dummy_noreturn.diff delete mode 100644 kbuild-r1599_KBUILD_SVN_INFO_KMK-fix.diff diff --git a/kbuild-0.1.2svn1599.tar.bz2 b/kbuild-0.1.2svn1599.tar.bz2 deleted file mode 100644 index 01bd210..0000000 --- a/kbuild-0.1.2svn1599.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e29baccd413d7c10c08d483f5a4be9546833e28bc976b324404327b4d2bca28 -size 1854034 diff --git a/kbuild-0.1.3svn1785.tar.bz2 b/kbuild-0.1.3svn1785.tar.bz2 new file mode 100644 index 0000000..4e7bd03 --- /dev/null +++ b/kbuild-0.1.3svn1785.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfbc60869de8d2103c4e4c308bbe106926044ffa9e17f0da4d4cfdb46e23f0b8 +size 1914691 diff --git a/kbuild-dummy_noreturn.diff b/kbuild-dummy_noreturn.diff new file mode 100644 index 0000000..d224b26 --- /dev/null +++ b/kbuild-dummy_noreturn.diff @@ -0,0 +1,13 @@ +Index: src/kmk/kmkbuiltin/expr.c +=================================================================== +--- src/kmk/kmkbuiltin/expr.c.orig ++++ src/kmk/kmkbuiltin/expr.c +@@ -304,6 +304,8 @@ eval6(void) + return v; + } else { + error(); ++ /* dummy return in order to make the build checks happy (this will never be reached) */ ++ return NULL; + } + /* NOTREACHED */ + } diff --git a/kbuild-r1599_KBUILD_SVN_INFO_KMK-fix.diff b/kbuild-r1599_KBUILD_SVN_INFO_KMK-fix.diff deleted file mode 100644 index 4cba6b2..0000000 --- a/kbuild-r1599_KBUILD_SVN_INFO_KMK-fix.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- Config.kmk.old 2008-05-04 16:26:48.000000000 +0200 -+++ Config.kmk 2008-05-04 16:27:05.000000000 +0200 -@@ -79,6 +79,7 @@ - $(warning Neither SvnInfo nor .svn/* was found in the root. Will have to cook up something too keep the build happy.) - $(KBUILD_SVN_INFO_KMK): - $(RM) -f $@ -+ @$(MKDIR) -p $(@D) - $(APPEND) $@ 'KBUILD_SVN_REV := 0' - $(APPEND) $@ 'KBUILD_SVN_URL := /dev/null' - diff --git a/kbuild.changes b/kbuild.changes index 9eff75a..5fc1af9 100644 --- a/kbuild.changes +++ b/kbuild.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu Sep 25 16:35:58 CEST 2008 - mkudlvasr@suse.cz + +- merge into openSUSE Factory + +------------------------------------------------------------------- +Thu Sep 18 19:53:10 CEST 2008 - suse-tux@gmx.de + +- added Patch2 (kbuild-dummy_noreturn.diff) in order to make the build checks happy + +------------------------------------------------------------------- +Sun Sep 14 20:13:08 CEST 2008 - suse-tux@gmx.de + +- update to 0.1.3svn1785 + +------------------------------------------------------------------- +Sun Sep 14 00:39:02 CEST 2008 - suse-tux@gmx.de + +- update to 0.1.3svn1775 +- removed kbuild-r1599_KBUILD_SVN_INFO_KMK-fix.diff + ------------------------------------------------------------------- Tue May 6 23:52:43 CEST 2008 - dmueller@suse.de diff --git a/kbuild.spec b/kbuild.spec index 65ab092..1b65ebc 100644 --- a/kbuild.spec +++ b/kbuild.spec @@ -1,10 +1,17 @@ # -# spec file for package kbuild (Version 0.1.2svn1599) +# spec file for package kbuild (Version 0.1.3svn1785) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -17,12 +24,12 @@ BuildRequires: bison flex libacl-devel License: GPL v2 or later Group: Development/Tools/Building Summary: framework for writing simple makefiles for complex tasks -Version: 0.1.2svn1599 +Version: 0.1.3svn1785 Release: 1 -Source0: %name-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 Patch0: kbuild-man.diff Patch1: warnings.diff -Patch2: kbuild-r1599_KBUILD_SVN_INFO_KMK-fix.diff +Patch2: kbuild-dummy_noreturn.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -73,9 +80,18 @@ rm -rf $RPM_BUILD_ROOT %defattr(-, root, root) %{_prefix}/bin/* %{_mandir}/*/* -/usr/share/kBuild +%{_datadir}/kBuild %changelog +* Thu Sep 25 2008 mkudlvasr@suse.cz +- merge into openSUSE Factory +* Thu Sep 18 2008 suse-tux@gmx.de +- added Patch2 (kbuild-dummy_noreturn.diff) in order to make the build checks happy +* Sun Sep 14 2008 suse-tux@gmx.de +- update to 0.1.3svn1785 +* Sun Sep 14 2008 suse-tux@gmx.de +- update to 0.1.3svn1775 +- removed kbuild-r1599_KBUILD_SVN_INFO_KMK-fix.diff * Wed May 07 2008 dmueller@suse.de - fix uninit return values * Sun May 04 2008 suse-tux@gmx.de