rpms
/
gfs2-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

* Tue Apr 07 2015 Andrew Price <anprice@redhat.com> - 3.1.8-1 

- New upstream release
- Remove perl dependency
- Update spec per the latest packaging guidelines
This commit is contained in:
Andrew Price 2015-04-07 19:18:33 +01:00
parent 6a770f893c
commit c9f9414bb5
4 changed files with 15 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,3 +6,4 @@
/gfs2-utils-3.1.5.tar.gz
/gfs2-utils-3.1.6.tar.gz
/gfs2-utils-3.1.7.tar.gz
/gfs2-utils-3.1.8.tar.gz

44
gfs2-utils.spec
View File

@ -11,7 +11,7 @@
###############################################################################
Name: gfs2-utils
Version: 3.1.7
Version: 3.1.8
Release: 1%{?dist}
License: GPLv2+ and LGPLv2+
Group: System Environment/Kernel
@ -19,11 +19,9 @@ Summary: Utilities for managing the global file system (GFS2)
%ifnarch %{arm}
%{?fedora:Requires: kmod(gfs2.ko) kmod(dlm.ko)}
%endif
Obsoletes: gfs2-cluster < %{version}
BuildRequires: ncurses-devel
BuildRequires: kernel-headers
BuildRequires: automake
BuildRequires: perl
BuildRequires: libtool
BuildRequires: zlib-devel
BuildRequires: gettext-devel
@ -31,55 +29,34 @@ BuildRequires: bison
BuildRequires: flex
BuildRequires: libblkid-devel
BuildRequires: check-devel
Source: https://fedorahosted.org/released/gfs2-utils/gfs2-utils-%{version}.tar.gz
URL: https://fedorahosted.org/cluster/wiki/HomePage
# The source for this package was pulled from the upstream git tree.
# Use the following commands to generate the tarball:
# git clone git://git.fedorahosted.org/gfs2-utils.git
# cd gfs2-utils
# ./make-tarball.sh
#
Source0: https://fedorahosted.org/released/gfs2-utils/gfs2-utils-%{version}.tar.gz
Patch0: gfs2_utils_tests_Build_unit_tests_with_consistent_cpp_flags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%prep
%setup -q -n gfs2-utils-%{version}
%patch0 -p1 -b .gfs2_utils_tests_Build_unit_tests_with_consistent_cpp_flags
%build
./autogen.sh
%configure
make %{_smp_mflags}
make %{_smp_mflags} V=1
%check
make check
make check || { cat tests/testsuite.log; exit 1; }
%install
rm -rf %{buildroot}
make -C gfs2 install DESTDIR=%{buildroot}
# Don't ship gfs2_{trace,lockcapture} in this package
rm -f %{buildroot}/sbin/gfs2_trace
rm -f %{buildroot}/sbin/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
# Install into /usr/sbin per UsrMove
mv %{buildroot}/sbin/fsck.gfs2 %{buildroot}/usr/sbin/
mv %{buildroot}/sbin/mkfs.gfs2 %{buildroot}/usr/sbin/
mv %{buildroot}/sbin/gfs2_grow %{buildroot}/usr/sbin/
mv %{buildroot}/sbin/gfs2_jadd %{buildroot}/usr/sbin/
%clean
rm -rf %{buildroot}
%description -n gfs2-utils
%description
The gfs2-utils package contains a number of utilities for creating,
checking, modifying, and correcting any inconsistencies in GFS2
file systems.
%files -n gfs2-utils
%defattr(-,root,root,-)
%files
%doc doc/COPYING.* doc/COPYRIGHT doc/*.txt
%doc doc/README.contributing doc/README.licence
%{_sbindir}/fsck.gfs2
@ -93,6 +70,11 @@ file systems.
%{_mandir}/man5/*
%changelog
* Tue Apr 07 2015 Andrew Price <anprice@redhat.com> - 3.1.8-1
- New upstream release
- Remove perl dependency
- Update spec per the latest packaging guidelines
* Mon Sep 08 2014 Andrew Price <anprice@redhat.com> - 3.1.7-1
- New upstream release
- Drop all patches

56
gfs2_utils_tests_Build_unit_tests_with_consistent_cpp_flags.patch
View File

@ -1,56 +0,0 @@
commit 54c5ee8ee1b5bf008400d1c86af3a44f15eb4970
Author: Andrew Price <anprice@redhat.com>
Date: Mon Sep 8 12:03:40 2014 +0200
gfs2-utils tests: Build unit tests with consistent cpp flags
The check_rgrp unit test was failing on ARM and s390 due to struct
gfs2_sbd having a different alignment from libgfs2. This was due to the
unit tests being built with different options to libgfs2. Fix up the
unit test CPPFLAGS to make sure the alignment is consistent.
Also bump the test timeout for check_rgrp to make sure it completes on
slower build machines.
Signed-off-by: Andrew Price <anprice@redhat.com>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 70e77ef..b912dfa 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,16 +15,22 @@ UNIT_CFLAGS = \
UNIT_LDADD = \
$(top_builddir)/gfs2/libgfs2/libgfs2.la \
@check_LIBS@
+UNIT_CPPFLAGS = \
+ -D_FILE_OFFSET_BITS=64 \
+ -D_LARGEFILE64_SOURCE \
+ -D_GNU_SOURCE
check_PROGRAMS = $(UNIT_TESTS)
check_meta_SOURCES = $(UNIT_SOURCES) check_meta.c
check_meta_CFLAGS = $(UNIT_CFLAGS)
check_meta_LDADD = $(UNIT_LDADD)
+check_meta_CPPFLAGS = $(UNIT_CPPFLAGS)
check_rgrp_SOURCES = $(UNIT_SOURCES) check_rgrp.c
check_rgrp_CFLAGS = $(UNIT_CFLAGS)
check_rgrp_LDADD = $(UNIT_LDADD)
+check_rgrp_CPPFLAGS = $(UNIT_CPPFLAGS)
endif
# The `:;' works around a Bash 3.2 bug when the output is not writable.
diff --git a/tests/check_rgrp.c b/tests/check_rgrp.c
index d113846..e5fca8d 100644
--- a/tests/check_rgrp.c
+++ b/tests/check_rgrp.c
@@ -125,7 +125,7 @@ static Suite * libgfs2_suite(void)
tcase_add_test(tc_rgrp, test_rbm_find_good);
tcase_add_test(tc_rgrp, test_rbm_find_bad);
tcase_add_test(tc_rgrp, test_rbm_find_lastblock);
- tcase_set_timeout(tc_rgrp, 60);
+ tcase_set_timeout(tc_rgrp, 120);
suite_add_tcase(s, tc_rgrp);
return s;

2
sources
View File

@ -1 +1 @@
b020102a326aecafef458fd1c9ccc5f3 gfs2-utils-3.1.7.tar.gz
f43b26f006b0a58d86a08eed579871f1 gfs2-utils-3.1.8.tar.gz