Compare commits

..

1 commit

Author SHA1 Message Date
Pokorra, Gerd
1a520cbb75 fix build problem from bug-id 1865626 2020-08-12 11:58:02 +02:00
6 changed files with 162 additions and 1 deletions

3
.gitignore vendored Normal file
View file

@ -0,0 +1,3 @@
/workspace-1.1.0.tar.gz
/workspace-1.3.0.tar.gz
/workspace-1.3.1.tar.gz

28
README.md Normal file
View file

@ -0,0 +1,28 @@
# workspace
The **workspace** package
Documentation files in markdown format are include in the package:
* introduction
> /usr/share/doc/workspace/README.md
* user guide
> /usr/share/doc/workspace/user-guide.md
* administration guide
> /usr/share/doc/workspace/admin-guide.md
Online you can see
* introduction
https://github.com/holgerBerger/hpc-workspace/blob/master/README.md
* user guide
https://github.com/holgerBerger/hpc-workspace/blob/master/user-guide.md
* administration guide
https://github.com/holgerBerger/hpc-workspace/blob/master/admin-guide.md

View file

@ -1 +0,0 @@
Orphaned for 6+ weeks

1
sources Normal file
View file

@ -0,0 +1 @@
SHA512 (workspace-1.3.1.tar.gz) = 794e4c545eee7ec0b50c9b5421a953a4f5f2cbc5cb141f5fdd0b83d13731c5dba422224a5e9c627be2cedcefdf95d3e409d67bf60f3e3834c5b0fda231a231c0

112
workspace.spec Normal file
View file

@ -0,0 +1,112 @@
Name: workspace
Version: 1.3.1
Release: 4%{?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
Patch0: ws_alloc_option.patch
#BuildRequires: sed
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}
# - 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
sed -e '/^SET(CMAKE_CXX_FLAGS "-Wall -g")/d' -i CMakeLists.txt
%patch0
%build
%cmake
%cmake_build
%install
%cmake_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
* Wed Aug 12 2020 Gerd Pokorra <gp@zimt.uni-siegen.de> - 1.3.1-4
- Fix bug 1865626 with using new cmake macros
https://bugzilla.redhat.com/show_bug.cgi?id=1865626
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-3
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 14 2020 Gerd Pokorra <gp@zimt.uni-siegen.de> - 1.3.1-1
- update to version 1.3.1
- add patch ws_alloc_option.patch
* Wed Jun 03 2020 Gerd Pokorra <gp@zimt.uni-siegen.de> - 1.3.0-2
- Rebuilt for Boost 1.73 (BUG ID: 1843150)
* Tue Jun 02 2020 Gerd Pokorra <gp@zimt.uni-siegen.de> - 1.3.0-1
- update to version 1.3.0
- remove patch and work with sed
* Sat May 30 2020 Jonathan Wakely <jwakely@redhat.com> - 1.1.0-6
- Rebuilt for Boost 1.73
* Sat Mar 28 2020 Gerd Pokorra <gp@zimt.uni-siegen.de> - 1.1.0-5
- add a comment above the patch to explain it
- separate BRs one per line
* Mon Mar 23 2020 Gerd Pokorra <gp@zimt.uni-siegen.de> - 1.1.0-4
- wrap description
* Wed Mar 18 2020 Gerd Pokorra <gp@zimt.uni-siegen.de> - 1.1.0-3
- remove the CXXFLAGS settings in CMakeLists.txt
* Tue Mar 17 2020 Gerd Pokorra <gp@zimt.uni-siegen.de> - 1.1.0-2
- add use of _hardened_build
* Tue Mar 17 2020 Gerd Pokorra <gp@zimt.uni-siegen.de> - 1.1.0-1
- add patch for version number
- improved the source tag
- updated to the new upstream version
- initail spec file

18
ws_alloc_option.patch Normal file
View file

@ -0,0 +1,18 @@
--- src/ws_allocate.cpp.orig 2020-06-17 21:07:08.000000000 +0200
+++ src/ws_allocate.cpp 2020-07-14 14:52:26.821618741 +0200
@@ -169,13 +169,13 @@
cerr << "Info: reminder email will be sent to local user account" << endl;
}
}
- } /* else {
+ } else {
// check if mail address was set with -m but not -r
if(opt.count("mailaddress")) {
cerr << "Error: You can't use the mailaddress (-m) without the reminder (-r) option." << endl;
exit(1);
}
- } */
+ }
// validate workspace name against nasty characters
static const boost::regex e("^[a-zA-Z0-9][a-zA-Z0-9_.-]*$");