From dbc8bd2fccba413ec6ca6353447b7e0868f66c3f Mon Sep 17 00:00:00 2001 From: "Pokorra, Gerd" Date: Wed, 12 Aug 2020 11:39:44 +0200 Subject: [PATCH 01/10] fix build problem from bug-id 1865626 --- workspace.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/workspace.spec b/workspace.spec index f54e821..fe20224 100644 --- a/workspace.spec +++ b/workspace.spec @@ -1,7 +1,7 @@ Name: workspace Version: 1.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A tool to create scratch directories by users with an expiration date License: GPLv3 @@ -38,12 +38,12 @@ sed -e '/^SET(CMAKE_CXX_FLAGS "-Wall -g")/d' -i CMakeLists.txt %build -%cmake . -%make_build +%cmake +%cmake_build %install -%make_install +%cmake_install install -p -m 755 contribs/ws_prepare %{buildroot}%{_sbindir}/ws_prepare @@ -67,6 +67,10 @@ install -p -m 755 contribs/ws_prepare %{buildroot}%{_sbindir}/ws_prepare %changelog +* Wed Aug 12 2020 Gerd Pokorra - 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 - 1.3.1-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 969e9ceb450336985592c2df8b09f01501cdd086 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 22 Jan 2021 21:03:28 +0000 Subject: [PATCH 02/10] Rebuilt for Boost 1.75 --- workspace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workspace.spec b/workspace.spec index fe20224..45d2fbd 100644 --- a/workspace.spec +++ b/workspace.spec @@ -1,7 +1,7 @@ Name: workspace Version: 1.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A tool to create scratch directories by users with an expiration date License: GPLv3 @@ -67,6 +67,9 @@ install -p -m 755 contribs/ws_prepare %{buildroot}%{_sbindir}/ws_prepare %changelog +* Fri Jan 22 2021 Jonathan Wakely - 1.3.1-5 +- Rebuilt for Boost 1.75 + * Wed Aug 12 2020 Gerd Pokorra - 1.3.1-4 - Fix bug 1865626 with using new cmake macros https://bugzilla.redhat.com/show_bug.cgi?id=1865626 From e4086acc248477c7b0ee499d7ec618893b2094c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:39:56 +0000 Subject: [PATCH 03/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- workspace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workspace.spec b/workspace.spec index 45d2fbd..4e35aa8 100644 --- a/workspace.spec +++ b/workspace.spec @@ -1,7 +1,7 @@ Name: workspace Version: 1.3.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A tool to create scratch directories by users with an expiration date License: GPLv3 @@ -67,6 +67,9 @@ install -p -m 755 contribs/ws_prepare %{buildroot}%{_sbindir}/ws_prepare %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.3.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jan 22 2021 Jonathan Wakely - 1.3.1-5 - Rebuilt for Boost 1.75 From b13dbf4ff518d03a49a9ae52deaa2457036cc490 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:08:08 +0000 Subject: [PATCH 04/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- workspace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workspace.spec b/workspace.spec index 4e35aa8..cca8f76 100644 --- a/workspace.spec +++ b/workspace.spec @@ -1,7 +1,7 @@ Name: workspace Version: 1.3.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A tool to create scratch directories by users with an expiration date License: GPLv3 @@ -67,6 +67,9 @@ install -p -m 755 contribs/ws_prepare %{buildroot}%{_sbindir}/ws_prepare %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.3.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 1.3.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From f0e038a986b726332088c5b3a662d88b594ec7d8 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sat, 7 Aug 2021 04:21:09 +0100 Subject: [PATCH 05/10] Rebuilt for Boost 1.76 --- workspace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workspace.spec b/workspace.spec index cca8f76..4bcb6ce 100644 --- a/workspace.spec +++ b/workspace.spec @@ -1,7 +1,7 @@ Name: workspace Version: 1.3.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A tool to create scratch directories by users with an expiration date License: GPLv3 @@ -67,6 +67,9 @@ install -p -m 755 contribs/ws_prepare %{buildroot}%{_sbindir}/ws_prepare %changelog +* Sat Aug 07 2021 Jonathan Wakely - 1.3.1-8 +- Rebuilt for Boost 1.76 + * Fri Jul 23 2021 Fedora Release Engineering - 1.3.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From d3e2611e079175272591582cabb73f4b97390453 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:39:55 +0000 Subject: [PATCH 06/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- workspace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workspace.spec b/workspace.spec index 4bcb6ce..b77d3e7 100644 --- a/workspace.spec +++ b/workspace.spec @@ -1,7 +1,7 @@ Name: workspace Version: 1.3.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A tool to create scratch directories by users with an expiration date License: GPLv3 @@ -67,6 +67,9 @@ install -p -m 755 contribs/ws_prepare %{buildroot}%{_sbindir}/ws_prepare %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.3.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sat Aug 07 2021 Jonathan Wakely - 1.3.1-8 - Rebuilt for Boost 1.76 From 507e789f066ff497d483c449cec5222fc5a7144e Mon Sep 17 00:00:00 2001 From: Thomas Rodgers Date: Wed, 4 May 2022 11:42:38 +0200 Subject: [PATCH 07/10] Rebuilt for Boost 1.78 --- workspace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workspace.spec b/workspace.spec index b77d3e7..920cbdb 100644 --- a/workspace.spec +++ b/workspace.spec @@ -1,7 +1,7 @@ Name: workspace Version: 1.3.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A tool to create scratch directories by users with an expiration date License: GPLv3 @@ -67,6 +67,9 @@ install -p -m 755 contribs/ws_prepare %{buildroot}%{_sbindir}/ws_prepare %changelog +* Wed May 04 2022 Thomas Rodgers - 1.3.1-10 +- Rebuilt for Boost 1.78 + * Sat Jan 22 2022 Fedora Release Engineering - 1.3.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From dfb9c4e3571147fee701bd44b14d4cd8dc7f9ba3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:37:34 +0000 Subject: [PATCH 08/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- workspace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workspace.spec b/workspace.spec index 920cbdb..eaf3b6b 100644 --- a/workspace.spec +++ b/workspace.spec @@ -1,7 +1,7 @@ Name: workspace Version: 1.3.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A tool to create scratch directories by users with an expiration date License: GPLv3 @@ -67,6 +67,9 @@ install -p -m 755 contribs/ws_prepare %{buildroot}%{_sbindir}/ws_prepare %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.3.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed May 04 2022 Thomas Rodgers - 1.3.1-10 - Rebuilt for Boost 1.78 From db2f228cb3af29c659c04e243072e2fd91682302 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 8 Nov 2022 15:36:06 -0600 Subject: [PATCH 09/10] Rebuild for yaml-cpp 0.7.0. --- workspace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workspace.spec b/workspace.spec index eaf3b6b..e3b86da 100644 --- a/workspace.spec +++ b/workspace.spec @@ -1,7 +1,7 @@ Name: workspace Version: 1.3.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A tool to create scratch directories by users with an expiration date License: GPLv3 @@ -67,6 +67,9 @@ install -p -m 755 contribs/ws_prepare %{buildroot}%{_sbindir}/ws_prepare %changelog +* Tue Nov 08 2022 Richard Shaw - 1.3.1-12 +- Rebuild for yaml-cpp 0.7.0. + * Sat Jul 23 2022 Fedora Release Engineering - 1.3.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 7afec8ed7201a116267a61ae12b44d92242651be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 9 Jan 2023 12:13:40 +0100 Subject: [PATCH 10/10] Orphaned for 6+ weeks --- .gitignore | 3 - README.md | 28 --------- dead.package | 1 + sources | 1 - workspace.spec | 136 ------------------------------------------ ws_alloc_option.patch | 18 ------ 6 files changed, 1 insertion(+), 186 deletions(-) delete mode 100644 .gitignore delete mode 100644 README.md create mode 100644 dead.package delete mode 100644 sources delete mode 100644 workspace.spec delete mode 100644 ws_alloc_option.patch diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 5076ef2..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/workspace-1.1.0.tar.gz -/workspace-1.3.0.tar.gz -/workspace-1.3.1.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 4004f75..0000000 --- a/README.md +++ /dev/null @@ -1,28 +0,0 @@ -# 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 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index 5af83b6..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (workspace-1.3.1.tar.gz) = 794e4c545eee7ec0b50c9b5421a953a4f5f2cbc5cb141f5fdd0b83d13731c5dba422224a5e9c627be2cedcefdf95d3e409d67bf60f3e3834c5b0fda231a231c0 diff --git a/workspace.spec b/workspace.spec deleted file mode 100644 index e3b86da..0000000 --- a/workspace.spec +++ /dev/null @@ -1,136 +0,0 @@ -Name: workspace - -Version: 1.3.1 -Release: 12%{?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 -* Tue Nov 08 2022 Richard Shaw - 1.3.1-12 -- Rebuild for yaml-cpp 0.7.0. - -* Sat Jul 23 2022 Fedora Release Engineering - 1.3.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed May 04 2022 Thomas Rodgers - 1.3.1-10 -- Rebuilt for Boost 1.78 - -* Sat Jan 22 2022 Fedora Release Engineering - 1.3.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sat Aug 07 2021 Jonathan Wakely - 1.3.1-8 -- Rebuilt for Boost 1.76 - -* Fri Jul 23 2021 Fedora Release Engineering - 1.3.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.3.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jan 22 2021 Jonathan Wakely - 1.3.1-5 -- Rebuilt for Boost 1.75 - -* Wed Aug 12 2020 Gerd Pokorra - 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 - 1.3.1-3 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 14 2020 Gerd Pokorra - 1.3.1-1 -- update to version 1.3.1 -- add patch ws_alloc_option.patch - -* Wed Jun 03 2020 Gerd Pokorra - 1.3.0-2 -- Rebuilt for Boost 1.73 (BUG ID: 1843150) - -* Tue Jun 02 2020 Gerd Pokorra - 1.3.0-1 -- update to version 1.3.0 -- remove patch and work with sed - -* Sat May 30 2020 Jonathan Wakely - 1.1.0-6 -- Rebuilt for Boost 1.73 - -* Sat Mar 28 2020 Gerd Pokorra - 1.1.0-5 -- add a comment above the patch to explain it -- separate BRs one per line - -* Mon Mar 23 2020 Gerd Pokorra - 1.1.0-4 -- wrap description - -* Wed Mar 18 2020 Gerd Pokorra - 1.1.0-3 -- remove the CXXFLAGS settings in CMakeLists.txt - -* Tue Mar 17 2020 Gerd Pokorra - 1.1.0-2 -- add use of _hardened_build - -* Tue Mar 17 2020 Gerd Pokorra - 1.1.0-1 -- add patch for version number -- improved the source tag -- updated to the new upstream version -- initail spec file diff --git a/ws_alloc_option.patch b/ws_alloc_option.patch deleted file mode 100644 index a4e7d2b..0000000 --- a/ws_alloc_option.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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_.-]*$");