Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update frontier client to version 2.10.2 #8550

Merged
merged 1 commit into from
Jun 19, 2023
Merged

Update frontier client to version 2.10.2 #8550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 7 additions & 16 deletions frontier_client.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
### RPM external frontier_client 2.10.1
### RPM external frontier_client 2.10.2
## INITENV +PATH PYTHON3PATH %{i}/python/lib

%define tag a8ea14344c937daf926813cf32a689f545be4af0
%define branch cms/%{realversion}
%define github_user cms-externals
Source: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
Source: http://frontier.cern.ch/dist/frontier_client__%{realversion}__src.tar.gz
Requires: expat pacparser zlib

%prep
%setup -n %{n}-%{realversion}
%setup -n %{n}__%{realversion}__src

%define makeargs "EXPAT_DIR=${EXPAT_ROOT} PACPARSER_DIR=${PACPARSER_ROOT} COMPILER_TAG=gcc_$(gcc -dumpversion) ZLIB_DIR=${ZLIB_ROOT}"

Expand All @@ -22,19 +19,13 @@ mkdir -p %i/lib
mkdir -p %i/include
export MAKE_ARGS=%{makeargs}
make $MAKE_ARGS CXXFLAGS="-ldl" distdir=%i dist

case $(uname) in
Darwin )
cp -r python %i
%ifos darwin
so=dylib
ln -sf libfrontier_client.%{realversion}.$so %i/lib/libfrontier_client.$so
ln -sf libfrontier_client.$so.%{realversion} %i/libfrontier_client.%(echo %v | sed -e "s/\([0-9]*\)\..*/\1/").$so
;;
* )
%else
so=so
ln -sf libfrontier_client.$so.%{realversion} %i/lib/libfrontier_client.$so
ln -sf libfrontier_client.$so.%{realversion} %i/lib/libfrontier_client.$so.%(echo %v | sed -e "s/\([0-9]*\)\..*/\1/")
;;
esac

cp -r python %i

%endif
13 changes: 0 additions & 13 deletions pacparser-python-fix.patch
View file
Open in desktop

This file was deleted.

8 changes: 3 additions & 5 deletions pacparser.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
### RPM external pacparser 1.4.0
### RPM external pacparser 1.4.2
## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES}
Source: https://github.com/%{n}/%{n}/releases/download/v%{realversion}/%{n}-v%{realversion}.tar.gz
Patch0: pacparser-python-fix
Source: https://github.com/manugarg/pacparser/archive/refs/tags/v%{realversion}.tar.gz
Requires: python3
BuildRequires: py3-setuptools

%prep
%setup -n %{n}-v%{realversion}
%patch0 -p1
%setup -n %{n}-%{realversion}

%build
make -C src all pymod PREFIX=%{i} PYTHON=$(which python3)
Expand Down