diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index 3076a6f..2daf545 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ /gfs2-utils-3.3.0.tar.gz /gfs2-utils-3.4.0.tar.gz /gfs2-utils-3.4.1.tar.gz -/gfs2-utils-3.5.0.tar.gz -/gfs2-utils-3.5.1.tar.gz -/gfs2-utils-3.6.1.tar.gz diff --git a/gfs2-utils.spec b/gfs2-utils.spec index 3f1220a..f2cd484 100644 --- a/gfs2-utils.spec +++ b/gfs2-utils.spec @@ -1,14 +1,11 @@ Name: gfs2-utils -Version: 3.6.1 +Version: 3.4.1 Release: 2%{?dist} -# Refer to doc/README.licence in the upstream tarball -License: GPL-2.0-or-later AND LGPL-2.1-or-later +License: GPLv2+ and LGPLv2+ Summary: Utilities for managing the global file system (GFS2) %ifnarch %{arm} %{?fedora:Recommends: kmod(gfs2.ko) kmod(dlm.ko)} %endif -# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -ExcludeArch: %{ix86} BuildRequires: ncurses-devel BuildRequires: kernel-headers BuildRequires: automake @@ -39,8 +36,8 @@ make check || { cat tests/testsuite.log; exit 1; } %install %make_install # Don't ship gfs2_{trace,lockcapture} in this package -rm -f %{buildroot}%{_sbindir}/gfs2_trace -rm -f %{buildroot}%{_sbindir}/gfs2_lockcapture +rm -f %{buildroot}/usr/sbin/gfs2_trace +rm -f %{buildroot}/usr/sbin/gfs2_lockcapture rm -f %{buildroot}%{_mandir}/man8/gfs2_trace.8 rm -f %{buildroot}%{_mandir}/man8/gfs2_lockcapture.8 @@ -55,6 +52,7 @@ modifying, and correcting inconsistencies in GFS2 file systems. %{_sbindir}/gfs2_grow %{_sbindir}/gfs2_jadd %{_sbindir}/mkfs.gfs2 +%{_sbindir}/gfs2_convert %{_sbindir}/gfs2_edit %{_sbindir}/tunegfs2 %{_sbindir}/glocktop @@ -65,55 +63,9 @@ modifying, and correcting inconsistencies in GFS2 file systems. %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules %changelog -* Wed Jul 23 2025 Fedora Release Engineering - 3.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Feb 27 2025 Andrew Price - 3.6.1-1 -- New upstream release - -* Mon Jan 20 2025 Andrew Price - 3.5.1-7 -- Don't hardcode /usr/sbin in the spec - -* Thu Jan 16 2025 Fedora Release Engineering - 3.5.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 18 2024 Fedora Release Engineering - 3.5.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 3.5.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 3.5.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 3.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Apr 11 2023 Andrew Price - 3.5.1-1 -- New upstream release - -* Thu Feb 09 2023 Andrew Price - 3.5.0-1 -- New upstream release -- Drop all patches -- Exclude i686 for https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -- Migrate to SPDX license identifier - -* Thu Jan 19 2023 Fedora Release Engineering - 3.4.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 3.4.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jun 23 2022 Andrew Price - 3.4.1-4 -- gfs2/edit: always use "%s"-style format for printf()-style functions -- Custom patch to fix a printw() call missed by the above - Fixes a build failure due to format-security warnings being treated as errors - -* Thu Jan 20 2022 Fedora Release Engineering - 3.4.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 3.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild +* Wed Nov 03 2021 Andrew Price - 3.4.1-2 +- Rebuild against latest kernel-headers +- Enables creating fs format 1802. * Mon Mar 15 2021 Andrew Price - 3.4.1-1 - New upstream version diff --git a/plans/testsuite.fmf b/plans/testsuite.fmf deleted file mode 100644 index 2f86880..0000000 --- a/plans/testsuite.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Run testsuite -discover: - how: fmf -execute: - how: tmt diff --git a/sources b/sources index bf0a0ab..b779448 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gfs2-utils-3.6.1.tar.gz) = c620cd7cac29af927a6325ffe024f3090285083f8a094935f318026e7fadb9b63cdbccc4962141ff93a2994fe32d138bf1ff999a58dfe268c034156132785346 +SHA512 (gfs2-utils-3.4.1.tar.gz) = 998c6d15e2f4b00ffffe18b8ab84f3ae11daf7ba4d10bc4e5d602ecc370b8f4de2fe44af4d7b9926785d4a39680139a9ae8a66d6863ff19b1a60fd999a60495e diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..aaaac51 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,11 @@ +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + environment: + PATH: ".:{{ ansible_env.PATH }}" + tests: + - upstream_test_suite: + dir: . + run: ./testsuite diff --git a/tests/testsuite.fmf b/tests/testsuite.fmf deleted file mode 100644 index dd9714f..0000000 --- a/tests/testsuite.fmf +++ /dev/null @@ -1,2 +0,0 @@ -summary: Upstream testsuite -test: ./testsuite