From 7be47f633133258bdc8d8d023254354f9e4c11cb Mon Sep 17 00:00:00 2001 From: "John A. Westlund" Date: Mon, 18 Jan 2016 16:16:53 -0800 Subject: [PATCH] add mysql support (#113) (#155). Also bump version to 15.08.6 (#111). --- components/rms/slurm/SPECS/slurm.spec | 41 ++++++++++++++++----------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/components/rms/slurm/SPECS/slurm.spec b/components/rms/slurm/SPECS/slurm.spec index dd1b0dad4a..4f49af7984 100644 --- a/components/rms/slurm/SPECS/slurm.spec +++ b/components/rms/slurm/SPECS/slurm.spec @@ -9,6 +9,7 @@ #----------------------------------------------------------------------------eh- %include %{_sourcedir}/OHPC_macros +%include %{_sourcedir}/rpmmacros %{!?PROJ_DELIM: %define PROJ_DELIM -ohpc} %define pname slurm @@ -100,8 +101,8 @@ Name: %{pname}%{PROJ_DELIM} -Version: 15.08.1 -%define ver_exp 15-08-1-1 +Version: 15.08.6 +%define ver_exp 15-08-6-1 Release: %{?dist} Summary: Slurm Workload Manager @@ -167,13 +168,21 @@ BuildRequires: openssl-devel >= 0.9.6 openssl >= 0.9.6 %endif %endif -%if %{slurm_with mysql} +#%if %{slurm_with mysql} %if 0%{?suse_version} +%if 0%{?suse_version} >= 1200 +BuildRequires: libmysqlclient-devel +%else BuildRequires: libmysql5 +%endif +%else +%if 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700 +BuildRequires: mariadb-devel >= 5.0.0 %else BuildRequires: mysql-devel >= 5.0.0 %endif %endif +#%endif %if %{slurm_with cray_alps} BuildRequires: mysql-devel @@ -328,7 +337,7 @@ authenticate user originating an RPC, digitally sign and/or encrypt messages %package bluegene Summary: Slurm interfaces to IBM Blue Gene system Group: ohpc/rms -Requires: slurm +Requires: %{pname}%{PROJ_DELIM} %description bluegene Slurm plugin interfaces to IBM Blue Gene system %endif @@ -336,7 +345,7 @@ Slurm plugin interfaces to IBM Blue Gene system %package -n %{pname}-slurmdbd%{PROJ_DELIM} Summary: Slurm database daemon Group: ohpc/rms -Requires: slurm-plugins%{PROJ_DELIM} slurm-sql%{PROJ_DELIM} +Requires: %{pname}-plugins%{PROJ_DELIM} %{pname}-sql%{PROJ_DELIM} %description -n %{pname}-slurmdbd%{PROJ_DELIM} Slurm database daemon. Used to accept and process database RPCs and upload database changes to slurmctld daemons on each cluster @@ -360,14 +369,14 @@ are in other packages %package -n %{pname}-torque%{PROJ_DELIM} Summary: Torque/PBS wrappers for transition from Torque/PBS to Slurm Group: ohpc/rms -Requires: slurm-perlapi +Requires: %{pname}-perlapi%{PROJ_DELIM} %description -n %{pname}-torque%{PROJ_DELIM} Torque wrapper scripts used for helping migrate from Torque/PBS to Slurm %package -n %{pname}-sjobexit%{PROJ_DELIM} Summary: Slurm job exit code management tools Group: ohpc/rms -Requires: slurm-perlapi%{PROJ_DELIM} +Requires: %{pname}-perlapi%{PROJ_DELIM} %description -n %{pname}-sjobexit%{PROJ_DELIM} Slurm job exit code management tools. Enables users to alter job exit code information for completed jobs @@ -375,7 +384,7 @@ information for completed jobs %package -n %{pname}-slurmdb-direct%{PROJ_DELIM} Summary: Wrappers to write directly to the slurmdb Group: ohpc/rms -Requires: slurm-perlapi%{PROJ_DELIM} +Requires: %{pname}-perlapi%{PROJ_DELIM} %description -n %{pname}-slurmdb-direct%{PROJ_DELIM} Wrappers to write directly to the slurmdb @@ -383,7 +392,7 @@ Wrappers to write directly to the slurmdb %package aix Summary: Slurm interfaces to IBM AIX Group: ohpc/rms -Requires: slurm +Requires: %{pname}{PROJ_DELIM} BuildRequires: proctrack >= 3 Obsoletes: slurm-aix-federation %description aix @@ -394,7 +403,7 @@ Slurm interfaces for IBM AIX systems %package percs Summary: Slurm plugins to run on an IBM PERCS system Group: ohpc/rms -Requires: slurm nrt +Requires: %{pname}%{PROJ_DELIM} nrt BuildRequires: nrt %description percs Slurm plugins to run on an IBM PERCS system, POE interface and NRT switch plugin @@ -405,7 +414,7 @@ Slurm plugins to run on an IBM PERCS system, POE interface and NRT switch plugin %package proctrack-sgi-job Summary: Slurm process tracking plugin for SGI job containers Group: ohpc/rms -Requires: slurm +Requires: %{pname}%{PROJ_DELIM} BuildRequires: job %description proctrack-sgi-job Slurm process tracking plugin for SGI job containers @@ -416,7 +425,7 @@ Slurm process tracking plugin for SGI job containers %package -n %{pname}-lua%{PROJ_DELIM} Summary: Slurm lua bindings Group: ohpc/rms -Requires: slurm%{PROJ_DELIM} lua +Requires: %{pname}%{PROJ_DELIM} lua BuildRequires: lua-devel %description -n %{pname}-lua%{PROJ_DELIM} Slurm lua bindings @@ -426,7 +435,7 @@ Includes the Slurm proctrack/lua and job_submit/lua plugin %package -n %{pname}-sjstat%{PROJ_DELIM} Summary: Perl tool to print Slurm job state information Group: ohpc/rms -Requires: slurm%{PROJ_DELIM} +Requires: %{pname}%{PROJ_DELIM} %description -n %{pname}-sjstat%{PROJ_DELIM} Perl tool to print Slurm job state information. The output is designed to give information on the resource usage and availablilty, as well as information @@ -438,7 +447,7 @@ utilites will provide more information and greater depth of understanding %package -n %{pname}-pam_slurm%{PROJ_DELIM} Summary: PAM module for restricting access to compute nodes via Slurm Group: ohpc/rms -Requires: slurm%{PROJ_DELIM} slurm-devel%{PROJ_DELIM} +Requires: %{pname}%{PROJ_DELIM} %{pname}-devel%{PROJ_DELIM} BuildRequires: pam-devel Obsoletes: pam_slurm %description -n %{pname}-pam_slurm%{PROJ_DELIM} @@ -452,7 +461,7 @@ according to the Slurm %package -n %{pname}-blcr%{PROJ_DELIM} Summary: Allows Slurm to use Berkeley Lab Checkpoint/Restart Group: ohpc/rms -Requires: slurm%{PROJ_DELIM} +Requires: %{pname}%{PROJ_DELIM} %description -n %{pname}-blcr%{PROJ_DELIM} Gives the ability for Slurm to use Berkeley Lab Checkpoint/Restart %endif @@ -466,7 +475,7 @@ Gives the ability for Slurm to use Berkeley Lab Checkpoint/Restart ### patch1 ### patch2 ### patch3 -%patch4 +### patch4 %build %configure \