Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 0 additions & 38 deletions afs-relocation-cern.spec

This file was deleted.

80 changes: 0 additions & 80 deletions cmsos.file

This file was deleted.

71 changes: 0 additions & 71 deletions fwlite_application_set.file

This file was deleted.

15 changes: 1 addition & 14 deletions rpm-preamble.file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
%define _build_id_links none

# Preliminarily define where things go. These are the places we
# know even without knowing the architecture yet. In particular
# we need _specdir to find "cmsos" to determine the architecture.
# know even without knowing the architecture yet.
# Note that we define the values all here, but some of them are
# not actually usable until we've managed to defined %cmsplatf.
#
Expand Down Expand Up @@ -133,18 +132,6 @@
%define debugsuffix %{?debug_build:_dbg}
%define cmscomp %{cmscompiler}%{cmscompilerv}

#set cmsos only if cmsBuild does not set it
%if "%{?cmsos:set}" != "set"
# Old versions of cmsBuild/install.sh used to keep cmsos script in
# _specdir rather than in _sourcedir. This makes sure that
# rpm-preamble works for boths.
%if "%{cmsbuildApiVersion}" == "0"
%{expand:%%define cmsos %(sh %_specdir/cmsos)}
%else
%{expand:%%define cmsos %(sh %_sourcedir/cmsos)}
%endif
%endif

%define cmsplatf %{cmsos}_%{cmscomp}%{debugsuffix}

# Define the variable name for dynamic linker search path.
Expand Down