diff --git a/0-Fix_libuuid_linking.patch b/0-Fix_libuuid_linking.patch new file mode 100644 index 0000000..057ac57 --- /dev/null +++ b/0-Fix_libuuid_linking.patch @@ -0,0 +1,26 @@ +commit 222e97c23dd015a8fc4bcceb598720cc17337edf +Author: Andrew Price +Date: Mon Feb 4 14:54:34 2019 +0000 + + Fix libuuid linking + + Fixes a build failure in Rawhide. + + Signed-off-by: Andrew Price + +diff --git a/gfs2/libgfs2/Makefile.am b/gfs2/libgfs2/Makefile.am +index 749da85a..76df920e 100644 +--- a/gfs2/libgfs2/Makefile.am ++++ b/gfs2/libgfs2/Makefile.am +@@ -54,8 +54,9 @@ libgfs2_la_CPPFLAGS = \ + $(uuid_CFLAGS) + + gfs2l_SOURCES = gfs2l.c +-gfs2l_LDADD = libgfs2.la +-gfs2l_LDFLAGS = $(uuid_LIBS) ++gfs2l_LDADD = \ ++ libgfs2.la \ ++ $(uuid_LIBS) + gfs2l_CPPFLAGS = \ + -I$(top_srcdir)/gfs2/include \ + -D_FILE_OFFSET_BITS=64 diff --git a/1-Fix_more_linking_errors.patch b/1-Fix_more_linking_errors.patch new file mode 100644 index 0000000..76028db --- /dev/null +++ b/1-Fix_more_linking_errors.patch @@ -0,0 +1,159 @@ +commit 1a92a964c8ba87d95b2f43b0adc3d351a7f7ba80 +Author: Andrew Price +Date: Mon Feb 4 15:31:33 2019 +0000 + + Fix more linking errors + + Signed-off-by: Andrew Price + +diff --git a/gfs2/convert/Makefile.am b/gfs2/convert/Makefile.am +index 4db643fb..2d61af74 100644 +--- a/gfs2/convert/Makefile.am ++++ b/gfs2/convert/Makefile.am +@@ -7,5 +7,6 @@ gfs2_convert_CPPFLAGS = \ + -I$(top_srcdir)/gfs2/include \ + -I$(top_srcdir)/gfs2/libgfs2 + +-gfs2_convert_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la +-gfs2_convert_LDFLAGS = $(uuid_LIBS) ++gfs2_convert_LDADD = \ ++ $(top_builddir)/gfs2/libgfs2/libgfs2.la \ ++ $(uuid_LIBS) +diff --git a/gfs2/edit/Makefile.am b/gfs2/edit/Makefile.am +index a9b177e9..4a89502c 100644 +--- a/gfs2/edit/Makefile.am ++++ b/gfs2/edit/Makefile.am +@@ -25,9 +25,9 @@ gfs2_edit_CFLAGS = \ + $(zlib_CFLAGS) \ + $(uuid_CFLAGS) + +-gfs2_edit_LDFLAGS = \ ++gfs2_edit_LDADD = \ ++ $(top_builddir)/gfs2/libgfs2/libgfs2.la \ + $(ncurses_LIBS) \ + $(zlib_LIBS) \ + $(uuid_LIBS) + +-gfs2_edit_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la +diff --git a/gfs2/fsck/Makefile.am b/gfs2/fsck/Makefile.am +index 97fcd404..1c528051 100644 +--- a/gfs2/fsck/Makefile.am ++++ b/gfs2/fsck/Makefile.am +@@ -36,6 +36,5 @@ fsck_gfs2_CPPFLAGS = \ + -I$(top_srcdir)/gfs2/libgfs2 + + fsck_gfs2_LDADD = \ +- $(top_builddir)/gfs2/libgfs2/libgfs2.la +-fsck_gfs2_LDFLAGS = \ ++ $(top_builddir)/gfs2/libgfs2/libgfs2.la \ + $(uuid_LIBS) +diff --git a/gfs2/glocktop/Makefile.am b/gfs2/glocktop/Makefile.am +index 1102c8e2..f5076554 100644 +--- a/gfs2/glocktop/Makefile.am ++++ b/gfs2/glocktop/Makefile.am +@@ -9,10 +9,6 @@ glocktop_SOURCES = \ + glocktop_CFLAGS = \ + $(ncurses_CFLAGS) + +-glocktop_LDFLAGS = \ +- $(ncurses_LIBS) \ +- $(uuid_LIBS) +- + glocktop_CPPFLAGS = \ + -D_FILE_OFFSET_BITS=64 \ + -D_LARGEFILE64_SOURCE \ +@@ -21,4 +17,6 @@ glocktop_CPPFLAGS = \ + -I$(top_srcdir)/gfs2/libgfs2 + + glocktop_LDADD = \ +- $(top_builddir)/gfs2/libgfs2/libgfs2.la ++ $(top_builddir)/gfs2/libgfs2/libgfs2.la \ ++ $(ncurses_LIBS) \ ++ $(uuid_LIBS) +diff --git a/gfs2/mkfs/Makefile.am b/gfs2/mkfs/Makefile.am +index f0dd961c..fd7145b8 100644 +--- a/gfs2/mkfs/Makefile.am ++++ b/gfs2/mkfs/Makefile.am +@@ -25,10 +25,10 @@ mkfs_gfs2_CPPFLAGS = $(COMMON_CPPFLAGS) + mkfs_gfs2_CFLAGS = \ + $(blkid_CFLAGS) \ + $(uuid_CFLAGS) +-mkfs_gfs2_LDFLAGS = \ ++mkfs_gfs2_LDADD = \ ++ $(top_builddir)/gfs2/libgfs2/libgfs2.la \ + $(blkid_LIBS) \ + $(uuid_LIBS) +-mkfs_gfs2_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la + + gfs2_grow_SOURCES = \ + main_grow.c \ +@@ -36,16 +36,17 @@ gfs2_grow_SOURCES = \ + + gfs2_grow_CPPFLAGS = $(COMMON_CPPFLAGS) + gfs2_grow_CFLAGS = $(blkid_CFLAGS) +-gfs2_grow_LDFLAGS = \ ++gfs2_grow_LDADD = \ ++ $(top_builddir)/gfs2/libgfs2/libgfs2.la \ + $(blkid_LIBS) \ + $(uuid_LIBS) +-gfs2_grow_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la + + gfs2_jadd_SOURCES = \ + main_jadd.c \ + metafs.c + + gfs2_jadd_CPPFLAGS = $(COMMON_CPPFLAGS) +-gfs2_jadd_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la +-gfs2_jadd_LDFLAGS = $(uuid_LIBS) ++gfs2_jadd_LDADD = \ ++ $(top_builddir)/gfs2/libgfs2/libgfs2.la \ ++ $(uuid_LIBS) + +diff --git a/gfs2/tune/Makefile.am b/gfs2/tune/Makefile.am +index 7628f424..171377d0 100644 +--- a/gfs2/tune/Makefile.am ++++ b/gfs2/tune/Makefile.am +@@ -13,5 +13,5 @@ tunegfs2_CPPFLAGS = \ + -I$(top_srcdir)/group/include + tunegfs2_CFLAGS = \ + $(uuid_CFLAGS) +-tunegfs2_LDFLAGS = \ ++tunegfs2_LDADD = \ + $(uuid_LIBS) +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 40fcfb47..40b486b0 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -26,8 +26,7 @@ nukerg_CFLAGS = \ + -I$(top_srcdir)/gfs2/libgfs2 \ + -I$(top_srcdir)/gfs2/include + nukerg_LDADD = \ +- $(top_builddir)/gfs2/libgfs2/libgfs2.la +-nukerg_LDFLAGS = \ ++ $(top_builddir)/gfs2/libgfs2/libgfs2.la \ + $(uuid_LIBS) + + if HAVE_CHECK +@@ -54,16 +53,18 @@ check_meta_SOURCES = \ + $(UNIT_SOURCES) \ + check_meta.c + check_meta_CFLAGS = $(UNIT_CFLAGS) +-check_meta_LDADD = $(UNIT_LDADD) +-check_meta_LDFLAGS = $(uuid_LIBS) ++check_meta_LDADD = \ ++ $(UNIT_LDADD) \ ++ $(uuid_LIBS) + 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_LDFLAGS = $(uuid_LIBS) ++check_rgrp_LDADD = \ ++ $(UNIT_LDADD) \ ++ $(uuid_LIBS) + check_rgrp_CPPFLAGS = $(UNIT_CPPFLAGS) + endif + diff --git a/README.en.md b/README.en.md deleted file mode 100644 index a37b691..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# gfs2-utils - -#### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index 19d6c8a..0000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# gfs2-utils - -#### 介绍 -{**以下是码云平台说明,您可以替换此简介** -码云是 OSCHINA 推出的基于 Git 的代码托管平台(同时支持 SVN)。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业,都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言,例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目,是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/gfs2-utils-3.2.0.tar.gz b/gfs2-utils-3.2.0.tar.gz new file mode 100644 index 0000000..feb51ac Binary files /dev/null and b/gfs2-utils-3.2.0.tar.gz differ diff --git a/gfs2-utils.spec b/gfs2-utils.spec new file mode 100644 index 0000000..7d16a42 --- /dev/null +++ b/gfs2-utils.spec @@ -0,0 +1,58 @@ +Name: gfs2-utils +Version: 3.2.0 +Release: 4 +Summary: Global Filesystem Utilities + +License: GPLv2+ and LGPLv2+ +URL: https://pagure.io/gfs2-utils +Source0: https://releases.pagure.org/gfs2-utils/gfs2-utils-%{version}.tar.gz + +BuildRequires: ncurses-devel kernel-headers automake libtool zlib-devel gettext-devel +BuildRequires: bison flex libblkid-devel libuuid-devel check-devel + +%description +The gfs2-utils package contains a number of utilities for creating, checking, +modifying, and correcting inconsistencies in GFS2 file systems. + +%package_help + +Patch0: 0-Fix_libuuid_linking.patch +Patch1: 1-Fix_more_linking_errors.patch + +%prep +%autosetup -n %{name}-%{version} -p1 + +%build +./autogen.sh +%configure +%make_build + +%check +make check || { cat tests/testsuite.log; exit 1; } + +%install +make -C gfs2 install DESTDIR=%{buildroot} + +%files +%defattr(-,root,root) +%license doc/COPYING.* doc/COPYRIGHT doc/README.licence +%{_sbindir}/gfs2* +%{_sbindir}/*.gfs2 +%{_sbindir}/tunegfs2 +%{_sbindir}/glocktop +%{_prefix}/lib/udev/rules.d/*.rules +%exclude %{_sbindir}/gfs2_trace +%exclude %{_sbindir}/gfs2_lockcapture + +%files help +%defattr(-,root,root) +%doc doc/*.txt doc/README.contributing +%{_mandir}/man5/* +%{_mandir}/man8/* +%exclude %{_mandir}/man8/gfs2_trace.8.gz +%exclude %{_mandir}/man8/gfs2_lockcapture.8.gz + +%changelog +* Sat Nov 23 2019 openEuler Buildteam - 3.2.0-4 +- Package Init +