pool/suse-hpc
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 663405 from science:HPC

Browse Source 
- Remove redefinition of _sysconfdir in %%hpc_cmake:
  Redefining _sysconfdir to %%hpc_sysconfdir caused a recursive loop!

OBS-URL: https://build.opensuse.org/request/show/663405
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/suse-hpc?expand=0&rev=16
This commit is contained in:
Dominique Leuenberger 2019-01-15 12:13:55 +00:00 committed by Git OBS Bridge
commit 090e030b48
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
macros.hpc
View File

@ -663,7 +663,7 @@ sys.exit(0)" %{1}
%define _prefix %{hpc_prefix} \ %define _prefix %{hpc_prefix} \
%define _sbindir %{hpc_sbindir} \ %define _sbindir %{hpc_sbindir} \
%define _sharedstatedir %{hpc_sharedstatedir} \ %define _sharedstatedir %{hpc_sharedstatedir} \
%define _sysconfdir %{hpc_sysconfdir} \ #Do NOT define _sysconfig to %%hpc_sysconfig here!
%cmake \\\ %cmake \\\
%undefine __cmake \\\ %undefine __cmake \\\
%undefine _bindir \\\ %undefine _bindir \\\
@ -677,7 +677,6 @@ sys.exit(0)" %{1}
%undefine _prefix \\\ %undefine _prefix \\\
%undefine _sbindir \\\ %undefine _sbindir \\\
%undefine _sharedstatedir \\\ %undefine _sharedstatedir \\\
%undefine _sysconfdir \\\
} }
# wraps macro from macros.meson - paths replaced by HPC paths. # wraps macro from macros.meson - paths replaced by HPC paths.

6
suse-hpc.changes
View File

@ -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 <toddrme2178@gmail.com> Fri Dec 14 19:20:06 UTC 2018 - Todd R <toddrme2178@gmail.com>

4
suse-hpc.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package suse-hpc # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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/
# #