From 266d5b533daba721bbbfdb9196f908f736db6de1c4f142e46ac07c0d008c8b1b Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 17 Dec 2019 16:14:44 +0000 Subject: [PATCH 1/2] - Modrnise spec file OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/kbuild?expand=0&rev=43 --- _service | 5 ----- kbuild.changes | 5 +++++ kbuild.spec | 48 +++++++++++++++++++++--------------------------- 3 files changed, 26 insertions(+), 32 deletions(-) delete mode 100644 _service diff --git a/_service b/_service deleted file mode 100644 index 87d7139..0000000 --- a/_service +++ /dev/null @@ -1,5 +0,0 @@ - - - enable - - diff --git a/kbuild.changes b/kbuild.changes index 26981fe..5266c87 100644 --- a/kbuild.changes +++ b/kbuild.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 17 16:11:30 UTC 2019 - Martin Pluskal + +- Modrnise spec file + ------------------------------------------------------------------- Sun Feb 10 20:19:51 UTC 2019 - Larry Finger diff --git a/kbuild.spec b/kbuild.spec index 528cb78..e3c8c25 100644 --- a/kbuild.spec +++ b/kbuild.spec @@ -1,7 +1,7 @@ # # spec file for package kbuild # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,21 +16,14 @@ # -Url: http://svn.netlabs.org/kbuild - +%define _svnrev 3110 Name: kbuild -BuildRequires: automake -BuildRequires: bison -BuildRequires: flex -BuildRequires: libacl-devel -BuildRequires: makeinfo -BuildRequires: readline-devel +Version: 0.1.9998svn%{_svnrev} +Release: 0 Summary: Framework for writing simple makefiles for complex tasks License: GPL-2.0-or-later Group: Development/Tools/Building -%define _svnrev 3110 -Version: 0.1.9998svn%{_svnrev} -Release: 0 +URL: https://svn.netlabs.org/kbuild Source0: %{name}-%{version}.tar.bz2 Patch0: kbuild-man.diff # PATCH-FIX-UPSTREAM speilicke@suse.com: Import local implementation if KMK @@ -46,11 +39,16 @@ Patch11: kbuild-gcc7.patch Patch12: use-alloca.patch Patch13: glob-lstat.patch Patch14: glob-interface.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: automake +BuildRequires: bison +BuildRequires: flex +BuildRequires: libacl-devel +BuildRequires: makeinfo +BuildRequires: readline-devel %description The goals of the kBuild framework: - + - Similar behavior across all supported platforms - Flexibility, don't create unnecessary restrictions preventing ad-hoc solutions @@ -78,33 +76,29 @@ The goals of the kBuild framework: %patch14 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS" -%__cat > SvnInfo.kmk << EOF +export CFLAGS="%{optflags}" +cat > SvnInfo.kmk << EOF KBUILD_SVN_REV := %{_svnrev} KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk EOF kBuild/env.sh --full make -f bootstrap.gmk SRCDIR=`pwd` kBuild/env.sh kmk rebuild PATH_INS=`pwd` -pod2man -c 'kBuild for SUSE Linux' -r kBuild-%version kmk.pod > kmk.1 +pod2man -c 'kBuild for SUSE Linux' -r kBuild-%{version} kmk.pod > kmk.1 %install -kBuild/env.sh kmk NIX_INSTALL_DIR=/usr BUILD_TYPE=release PATH_INS=%{buildroot} LDFLAGS=-Wl,--as-needed install -%__install -m 644 -D kmk.1 %buildroot/%_mandir/man1/kmk.1 +kBuild/env.sh kmk NIX_INSTALL_DIR=%{_prefix} BUILD_TYPE=release PATH_INS=%{buildroot} LDFLAGS=-Wl,--as-needed install +install -m 644 -D kmk.1 %{buildroot}/%{_mandir}/man1/kmk.1 #remove execute flag, if occurs -%__chmod a-x %{buildroot}/%{_datadir}/kBuild/*/*kmk -%__rm -r %{buildroot}%{_datadir}/doc/kBuild-0.1.9998 - -%clean -%__rm -rf $RPM_BUILD_ROOT +chmod a-x %{buildroot}/%{_datadir}/kBuild/*/*kmk +rm -r %{buildroot}%{_datadir}/doc/kBuild-0.1.9998 %files -%defattr(-, root, root) %license COPYING +%license kBuild/doc/COPYING-FDL-1.3 %doc ChangeLog -%doc kBuild/doc/COPYING-FDL-1.3 %doc kBuild/doc/QuickReference-kmk.* -%{_mandir}/man1/kmk.1.gz %{_bindir}/* +%{_mandir}/man1/kmk.1%{?ext_man} %{_datadir}/kBuild %changelog From 7ad603aa687a9fda7c8916cf100ef20131d8b23be35035d7d5982bc7a87d0eb3 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 17 Dec 2019 16:16:15 +0000 Subject: [PATCH 2/2] - Modernise spec file OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/kbuild?expand=0&rev=44 --- kbuild.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kbuild.changes b/kbuild.changes index 5266c87..77e762d 100644 --- a/kbuild.changes +++ b/kbuild.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Tue Dec 17 16:11:30 UTC 2019 - Martin Pluskal -- Modrnise spec file +- Modernise spec file ------------------------------------------------------------------- Sun Feb 10 20:19:51 UTC 2019 - Larry Finger