From e01acb9e0ff5054bcd6ab1efa74ef4e3122db58c Mon Sep 17 00:00:00 2001 From: "Pokorra, Gerd" Date: Thu, 2 Apr 2020 02:00:37 +0200 Subject: [PATCH] initial files for the f32 branch --- sources | 1 + workspace.spec | 80 +++++++++++++++++++++++++++++++++++++++ ws_1.1.0_CMakeLists.patch | 20 ++++++++++ 3 files changed, 101 insertions(+) create mode 100644 sources create mode 100644 workspace.spec create mode 100644 ws_1.1.0_CMakeLists.patch diff --git a/sources b/sources new file mode 100644 index 0000000..cd2e61e --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (workspace-1.1.0.tar.gz) = 5fa37a5edfc098fdef7fc575827d11490edfcf80eb7e97711662b29d3aaf17af57ba3bd275f7c25156d90ea6240c862eb155bee37193122cbd20650d74b6169f diff --git a/workspace.spec b/workspace.spec new file mode 100644 index 0000000..6ceca53 --- /dev/null +++ b/workspace.spec @@ -0,0 +1,80 @@ +%global _hardened_build 1 + +Name: workspace + +Version: 1.1.0 +Release: 1%{?dist} +Summary: A tool to create scratch directories by users with an expiration date + +License: GPLv3 +URL: https://github.com/holgerBerger/hpc-workspace +Source0: https://github.com/holgerBerger/hpc-workspace/archive/v%{version}/%{name}-%{version}.tar.gz +# - patch the version to be correct from 1.0.0 to 1.1.0, this is already in +# upstream +# - remove the cmake_cxx_flags settings in the file CMakeLists.txt because this +# override the build flags form the optflags macro and so allows the use of +# the cmake macro in this spec file +Patch0: ws_1.1.0_CMakeLists.patch + +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: cmake +BuildRequires: boost-devel +BuildRequires: ncurses-devel +BuildRequires: yaml-cpp-devel +BuildRequires: python3-pyyaml + +Requires: python3-pyyaml + + +%description +A **workspace** is a directory, with an associated expiration date, created on +behalf of a user, to prevent disks from uncontrolled filling. +The project provides user and admin tools to manage those directories. + + +%prep +%setup -q -n hpc-%{name}-%{version} +%patch0 + + +%build +%cmake . +%make_build + + +%install +%make_install +install -p -m 755 contribs/ws_prepare %{buildroot}%{_sbindir}/ws_prepare + + +%files +%license LICENSE +%doc README.md admin-guide.md user-guide.md ws.conf ws.conf_full_sample +%{_bindir}/ws_extend +%{_bindir}/ws_find +%{_bindir}/ws_list +%{_bindir}/ws_register +%{_bindir}/ws_send_ical +# sbin/ws_restore is only for root +%{_sbindir}/ws_* +%{_mandir}/man1/ws_* + +# this files need setuid +%defattr(4111,root,root) +%{_bindir}/ws_allocate +%{_bindir}/ws_release +%{_bindir}/ws_restore + + +%changelog +* Thu Apr 02 2020 Gerd Pokorra - 1.1.0-1 +- add a comment above the patch to explain it +- separate BRs one per line +- wrap description +- remove the CXXFLAGS settings in CMakeLists.txt +- add use of _hardened_build +- add patch for version number +- improved the source tag +- updated to the new upstream version +- initail spec file diff --git a/ws_1.1.0_CMakeLists.patch b/ws_1.1.0_CMakeLists.patch new file mode 100644 index 0000000..6203ae3 --- /dev/null +++ b/ws_1.1.0_CMakeLists.patch @@ -0,0 +1,20 @@ +--- CMakeLists.txt 2020-03-16 20:25:04.000000000 +0100 ++++ CMakeLists.txt 2020-03-18 15:26:05.986016857 +0100 +@@ -5,8 +5,6 @@ + #workaround for old Redhat 6 cmake + set(Boost_NO_BOOST_CMAKE ON) + +-SET(CMAKE_CXX_FLAGS "-Wall -g") +- + OPTION(STATIC "static linking" FALSE) + IF (STATIC) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static") +@@ -100,7 +98,7 @@ + ELSE () + SET (IS_GIT_REPOSITORY OFF) + # set to version number of the latest release +- SET (WS_VERSION 1.0.0) ++ SET (WS_VERSION 1.1.0) + ENDIF () + add_definitions("-DWS_VERSION=\"${WS_VERSION}\"") +