From 88255ddc259da403ae202e436bc074d4553044b71cd6505225a9c161ba94ca9e Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Mon, 7 Jan 2019 15:47:33 +0000 Subject: [PATCH] - Remove redefinition of _sysconfdir in %%hpc_cmake: Redefining _sysconfdir to %%hpc_sysconfdir caused a recursive loop! OBS-URL: https://build.opensuse.org/package/show/science:HPC/suse-hpc?expand=0&rev=41 --- macros.hpc | 3 +-- suse-hpc.changes | 6 ++++++ suse-hpc.spec | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/macros.hpc b/macros.hpc index cf40db6..3ce0420 100644 --- a/macros.hpc +++ b/macros.hpc @@ -663,7 +663,7 @@ sys.exit(0)" %{1} %define _prefix %{hpc_prefix} \ %define _sbindir %{hpc_sbindir} \ %define _sharedstatedir %{hpc_sharedstatedir} \ - %define _sysconfdir %{hpc_sysconfdir} \ +#Do NOT define _sysconfig to %%hpc_sysconfig here! %cmake \\\ %undefine __cmake \\\ %undefine _bindir \\\ @@ -677,7 +677,6 @@ sys.exit(0)" %{1} %undefine _prefix \\\ %undefine _sbindir \\\ %undefine _sharedstatedir \\\ - %undefine _sysconfdir \\\ } # wraps macro from macros.meson - paths replaced by HPC paths. diff --git a/suse-hpc.changes b/suse-hpc.changes index 526da59..1eaba0f 100644 --- a/suse-hpc.changes +++ b/suse-hpc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 7 15:44:07 UTC 2019 - eich@suse.com + +- Remove redefinition of _sysconfdir in %%hpc_cmake: + Redefining _sysconfdir to %%hpc_sysconfdir caused a recursive loop! + ------------------------------------------------------------------- Fri Dec 14 19:20:06 UTC 2018 - Todd R diff --git a/suse-hpc.spec b/suse-hpc.spec index a27141e..c96f293 100644 --- a/suse-hpc.spec +++ b/suse-hpc.spec @@ -1,7 +1,7 @@ # # spec file for package suse-hpc # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ #