* Tue Sep 01 2020 Andrew Price <anprice@redhat.com> - 3.3.0-1

- New upstream version
- Add dependency on bzip2
- Drop all patches
- gfs2_withdraw_helper is now in /usr/libexec/

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -1,6 +1 @@
 /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

gating.yaml

@@ -1,15 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_testing
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
-
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}

gfs2-utils.spec

@@ -1,14 +1,11 @@
 Name: gfs2-utils
-Version: 3.6.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
+Version: 3.3.0
+Release: 1%{?dist}
+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
@@ -21,7 +18,6 @@ BuildRequires: libblkid-devel
 BuildRequires: libuuid-devel
 BuildRequires: check-devel
 BuildRequires: bzip2-devel
-BuildRequires: make
 Source: https://releases.pagure.org/gfs2-utils/gfs2-utils-%{version}.tar.gz
 URL: https://pagure.io/gfs2-utils
 
@@ -39,8 +35,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 +51,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,69 +62,6 @@ 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 <releng@fedoraproject.org> - 3.6.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu Feb 27 2025 Andrew Price <anprice@redhat.com> - 3.6.1-1
-- New upstream release
-
-* Mon Jan 20 2025 Andrew Price <anprice@redhat.com> - 3.5.1-7
-- Don't hardcode /usr/sbin in the spec
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Apr 11 2023 Andrew Price <anprice@redhat.com> - 3.5.1-1
-- New upstream release
-
-* Thu Feb 09 2023 Andrew Price <anprice@redhat.com> - 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 <releng@fedoraproject.org> - 3.4.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jun 23 2022 Andrew Price <anprice@redhat.com> - 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 <releng@fedoraproject.org> - 3.4.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Mar 15 2021 Andrew Price <anprice@redhat.com> - 3.4.1-1
-- New upstream version
-
-* Mon Mar 08 2021 Andrew Price <anprice@redhat.com> - 3.4.0-1
-- New upstream version
-- Update testsuite script
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Sep 03 2020 Andrew Price <anprice@redhat.com> - 3.3.0-2
-- Version bump to enable gating tests
-
 * Tue Sep 01 2020 Andrew Price <anprice@redhat.com> - 3.3.0-1
 - New upstream version
 - Add dependency on bzip2

plans/testsuite.fmf

@@ -1,5 +0,0 @@
-summary: Run testsuite
-discover:
-  how: fmf
-execute:
-  how: tmt

sources

@@ -1 +1 @@
-SHA512 (gfs2-utils-3.6.1.tar.gz) = c620cd7cac29af927a6325ffe024f3090285083f8a094935f318026e7fadb9b63cdbccc4962141ff93a2994fe32d138bf1ff999a58dfe268c034156132785346
+SHA512 (gfs2-utils-3.3.0.tar.gz) = b5ed1fb91eaf88fd163b682a73a3f54efd000e513206aba90e6286e68d8b13c325373da1bde94c8f48c0d235b60f22f6269f9103c508aebf13b15d9470b745d0

tests/atlocal

@@ -1,8 +0,0 @@
-GFS_TGT="../../testvol"
-GFS_TGT_SZ=10
-GFS_MKFS="mkfs.gfs2 -O -D"
-
-gfs_max_blocks()
-{
-	printf $((GFS_TGT_SZ*1073741824/$1))
-}

tests/rgrifieldscheck.sh

@@ -1,20 +0,0 @@
-#!/bin/sh
-dev=$1
-i=0
-gfs2_edit -p rg 0 $dev | grep rg_data0 > /dev/null 2>&1
-# New fields not present in /usr/include/linux/gfs2_ondisk.h
-test $? = 0 || exit 0
-gfs2_edit -p rindex $dev | while read field rival unused
-do
-	test $field = ri_data0 -o $field = ri_data -o $field = ri_bitbytes || continue
-	rgfield=$(echo $field | sed 's/ri/rg/')
-	rgval=$(gfs2_edit -p rg $i $dev | grep " $rgfield " | awk '{print $2}')
-
-	if test "$rival" != "$rgval"
-	then
-		echo "Bad $rgfield in rg $i: $rgval (expected: $rival)" >&2
-		exit 1
-	fi
-
-	test $field = ri_bitbytes && i=$((i+1))
-done

tests/rgskipcheck.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-dev=$1
-rgcount=$(gfs2_edit -p rgcount $dev | cut -f1 -d' ')
-prevaddr=$(gfs2_edit -p rg 0 $dev | grep ^RG | awk '{print $5}')
-prevskip=0
-for i in `seq 0 $(($rgcount - 1))`; do
-	addr=$(gfs2_edit -p rg $i $dev | grep ^RG | awk '{print $5}')
-	expected=$(($addr - $prevaddr))
-
-	if test $prevskip != $expected; then
-		echo "Bad rg_skip in rg $(($i - 1)): $prevskip (expected: $expected)" >&2
-		exit 1
-	fi
-
-	prevskip=$(gfs2_edit -p rg $i $dev | grep rg_skip | awk '{print $2}')
-	prevaddr=$addr
-done
-

tests/testsuite.fmf

@@ -1,2 +0,0 @@
-summary: Upstream testsuite
-test: ./testsuite