[gfs2-utils] * Mon Sep 08 2014 Andrew Price <anprice at redhat.com> - 3.1.7-1 - New upstream release - Drop all patc

Mon Sep 8 11:04:14 UTC 2014

commit 6a770f893c6fc6a05da911f8369758aee3e169c2
Author: Andrew Price <anprice at redhat.com>
Date:   Mon Sep 8 11:48:03 2014 +0100

    * Mon Sep 08 2014 Andrew Price <anprice at redhat.com> - 3.1.7-1
    - New upstream release
    - Drop all patches
    - gfs2-utils tests: Build unit tests with consistent cpp flags

 .gitignore                                         |    1 +
 ...s2_grow_Don_t_try_to_open_an_empty_string.patch |  183 --------------------
 ...86-1-libgfs2_Add_lgfs2_open_mnt_functions.patch |  141 ---------------
 ...athname_mounted_callers_to_lgfs2_open_mnt.patch |  168 ------------------
 ...9286-3-libgfs2_Remove_is_pathname_mounted.patch |   94 ----------
 gfs2-utils.spec                                    |   23 ++--
 ...uild_unit_tests_with_consistent_cpp_flags.patch |   56 ++++++
 sources                                            |    2 +-
 8 files changed, 69 insertions(+), 599 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 02bd2bd..8e5aacd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /gfs2-utils-3.1.4.tar.gz
 /gfs2-utils-3.1.5.tar.gz
 /gfs2-utils-3.1.6.tar.gz
+/gfs2-utils-3.1.7.tar.gz
diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index 9810021..92b012c 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,7 +1,7 @@
 ###############################################################################
 ###############################################################################
 ##
-##  Copyright (C) 2004-2013 Red Hat, Inc.  All rights reserved.
+##  Copyright (C) 2004-2014 Red Hat, Inc.  All rights reserved.
 ##
 ##  This copyrighted material is made available to anyone wishing to use,
 ##  modify, copy, or redistribute it subject to the terms and conditions
@@ -11,8 +11,8 @@
 ###############################################################################
 
 Name: gfs2-utils
-Version: 3.1.6
-Release: 9%{?dist}
+Version: 3.1.7
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Kernel
 Summary: Utilities for managing the global file system (GFS2)
@@ -40,19 +40,13 @@ URL: https://fedorahosted.org/cluster/wiki/HomePage
 # ./make-tarball.sh
 #
 Source0: https://fedorahosted.org/released/gfs2-utils/gfs2-utils-%{version}.tar.gz
-Patch0: bz1079286-0-gfs2_grow_Don_t_try_to_open_an_empty_string.patch
-Patch1: bz1079286-1-libgfs2_Add_lgfs2_open_mnt_functions.patch
-Patch2: bz1079286-2-Switch_is_pathname_mounted_callers_to_lgfs2_open_mnt.patch
-Patch3: bz1079286-3-libgfs2_Remove_is_pathname_mounted.patch
+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
-%patch0 -p1 -b .bz1079286-0-gfs2_grow_Don_t_try_to_open_an_empty_string
-%patch1 -p1 -b .bz1079286-1-libgfs2_Add_lgfs2_open_mnt_functions
-%patch2 -p1 -b .bz1079286-2-Switch_is_pathname_mounted_callers_to_lgfs2_open_mnt
-%patch3 -p1 -b .bz1079286-3-libgfs2_Remove_is_pathname_mounted
+%setup -q -n gfs2-utils-%{version}
+%patch0 -p1 -b .gfs2_utils_tests_Build_unit_tests_with_consistent_cpp_flags
 
 %build
 ./autogen.sh
@@ -99,6 +93,11 @@ file systems.
 %{_mandir}/man5/*
 
 %changelog
+* Mon Sep 08 2014 Andrew Price <anprice at redhat.com> - 3.1.7-1
+- New upstream release
+- Drop all patches
+- gfs2-utils tests: Build unit tests with consistent cpp flags
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.6-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/gfs2_utils_tests_Build_unit_tests_with_consistent_cpp_flags.patch b/gfs2_utils_tests_Build_unit_tests_with_consistent_cpp_flags.patch
new file mode 100644
index 0000000..e61d3bf
--- /dev/null
+++ b/gfs2_utils_tests_Build_unit_tests_with_consistent_cpp_flags.patch
@@ -0,0 +1,56 @@
+commit 54c5ee8ee1b5bf008400d1c86af3a44f15eb4970
+Author: Andrew Price <anprice at 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 at 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;
diff --git a/sources b/sources
index f4312d3..0605e78 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9d47c272298c62868dd49c7b1f4bcefc  gfs2-utils-3.1.6.tar.gz
+b020102a326aecafef458fd1c9ccc5f3  gfs2-utils-3.1.7.tar.gz
