[packages/gfs2-utils] - updated to 3.5.1, use python3

qboosh qboosh at pld-linux.org
Mon Sep 9 21:12:12 CEST 2024 

commit f6536fb8426c49b57771e5b2b9369bf4d4cbb24f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Sep 9 21:04:03 2024 +0200

    - updated to 3.5.1, use python3

 gfs2-utils-link.patch | 115 --------------------------------------------------
 gfs2-utils.spec       |  18 ++++----
 2 files changed, 9 insertions(+), 124 deletions(-)
---
diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index bae0f31..ccc7156 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -2,19 +2,19 @@
 Summary:	Global File System 2 (GFS2) utilities
 Summary(pl.UTF-8):	Narzędzia do systemu plików GFS2 (Global File System 2)
 Name:		gfs2-utils
-Version:	3.1.10
+Version:	3.5.1
 Release:	1
 License:	LGPL v2.1+ (libraries), GPL v2+ (applications)
 Group:		Applications/System
-Source0:	http://releases.pagure.org/gfs2-utils/%{name}-%{version}.tar.xz
-# Source0-md5:	31d330b1f69da8474a52bf36a824e9c1
-Patch0:		%{name}-link.patch
+Source0:	https://releases.pagure.org/gfs2-utils/%{name}-%{version}.tar.xz
+# Source0-md5:	b96b0eed06546da2ee73c3f373135ebf
 URL:		https://pagure.io/gfs2-utils
-BuildRequires:	autoconf >= 2.63
+BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	bison
+BuildRequires:	bzip2-devel
 BuildRequires:	flex
-BuildRequires:	gettext-devel >= 0.18
+BuildRequires:	gettext-devel >= 0.19
 BuildRequires:	libblkid-devel
 BuildRequires:	libtool >= 2:2.2.6
 BuildRequires:	libuuid-devel
@@ -53,10 +53,10 @@ na wszystkich innych maszynach w klastrze.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %{__sed} -i -e 's, po/Makefile.in$,,' configure.ac
-%{__sed} -i -e '1s,#!/usr/bin/env python,#!/usr/bin/python,' gfs2/scripts/gfs2_{lockcapture,trace}
+%{__sed} -i -e '1s,/usr/bin/python,%{__python3},' gfs2/scripts/gfs2_lockcapture
+%{__sed} -i -e '1s,/usr/bin/env python,%{__python3},' gfs2/scripts/gfs2_trace
 
 %build
 %{__gettextize}
@@ -97,9 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) /sbin/mkfs.gfs2
 %attr(755,root,root) %{_sbindir}/gfs2_convert
 %attr(755,root,root) %{_sbindir}/gfs2_edit
-%attr(755,root,root) %{_sbindir}/gfs2_withdraw_helper
 %attr(755,root,root) %{_sbindir}/glocktop
 %attr(755,root,root) %{_sbindir}/tunegfs2
+%attr(755,root,root) %{_libexecdir}/gfs2_withdraw_helper
 /lib/udev/rules.d/82-gfs2-withdraw.rules
 %{_mandir}/man5/gfs2.5*
 %{_mandir}/man8/fsck.gfs2.8*
diff --git a/gfs2-utils-link.patch b/gfs2-utils-link.patch
deleted file mode 100644
index 87676a1..0000000
--- a/gfs2-utils-link.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- gfs2-utils-3.1.10/gfs2/libgfs2/Makefile.am.orig	2017-03-28 16:08:39.000000000 +0200
-+++ gfs2-utils-3.1.10/gfs2/libgfs2/Makefile.am	2018-05-16 22:11:05.220787174 +0200
-@@ -52,8 +52,7 @@
- 	$(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
---- gfs2-utils-3.1.10/gfs2/convert/Makefile.am.orig	2017-03-28 16:08:39.000000000 +0200
-+++ gfs2-utils-3.1.10/gfs2/convert/Makefile.am	2018-05-16 22:14:39.020784730 +0200
-@@ -7,5 +7,4 @@
- 	-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)
---- gfs2-utils-3.1.10/gfs2/fsck/Makefile.am.orig	2017-03-28 16:08:39.000000000 +0200
-+++ gfs2-utils-3.1.10/gfs2/fsck/Makefile.am	2018-05-17 05:29:56.060486556 +0200
-@@ -36,6 +36,4 @@
- 	-I$(top_srcdir)/gfs2/libgfs2
- 
- fsck_gfs2_LDADD = \
--	$(top_builddir)/gfs2/libgfs2/libgfs2.la
--fsck_gfs2_LDFLAGS = \
--	$(uuid_LIBS)
-+	$(top_builddir)/gfs2/libgfs2/libgfs2.la	$(uuid_LIBS)
---- gfs2-utils-3.1.10/gfs2/mkfs/Makefile.am.orig	2017-03-28 16:08:39.000000000 +0200
-+++ gfs2-utils-3.1.10/gfs2/mkfs/Makefile.am	2018-05-17 05:35:10.050482945 +0200
-@@ -25,10 +25,7 @@
- mkfs_gfs2_CFLAGS = \
- 	$(blkid_CFLAGS) \
- 	$(uuid_CFLAGS)
--mkfs_gfs2_LDFLAGS = \
--	$(blkid_LIBS) \
--	$(uuid_LIBS)
--mkfs_gfs2_LDADD	= $(top_builddir)/gfs2/libgfs2/libgfs2.la
-+mkfs_gfs2_LDADD	= $(top_builddir)/gfs2/libgfs2/libgfs2.la $(blkid_LIBS) $(uuid_LIBS)
- 
- gfs2_grow_SOURCES = \
- 	main_grow.c \
-@@ -36,16 +33,12 @@
- 
- gfs2_grow_CPPFLAGS = $(COMMON_CPPFLAGS)
- gfs2_grow_CFLAGS = $(blkid_CFLAGS)
--gfs2_grow_LDFLAGS = \
--	$(blkid_LIBS) \
--	$(uuid_LIBS)
--gfs2_grow_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
-+gfs2_grow_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la $(blkid_LIBS) $(uuid_LIBS)
- 
- 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)
- 
---- gfs2-utils-3.1.10/gfs2/glocktop/Makefile.am.orig	2017-03-28 16:08:39.000000000 +0200
-+++ gfs2-utils-3.1.10/gfs2/glocktop/Makefile.am	2018-05-17 05:37:16.380481493 +0200
-@@ -9,10 +9,6 @@
- glocktop_CFLAGS = \
- 	$(ncurses_CFLAGS)
- 
--glocktop_LDFLAGS = \
--	$(ncurses_LIBS) \
--	$(uuid_LIBS)
--
- glocktop_CPPFLAGS = \
- 	-D_FILE_OFFSET_BITS=64 \
- 	-D_LARGEFILE64_SOURCE \
-@@ -21,4 +17,4 @@
- 	-I$(top_srcdir)/gfs2/libgfs2
- 
- glocktop_LDADD = \
--	$(top_builddir)/gfs2/libgfs2/libgfs2.la
-+	$(top_builddir)/gfs2/libgfs2/libgfs2.la	$(ncurses_LIBS) $(uuid_LIBS)
---- gfs2-utils-3.1.10/tests/Makefile.am.orig	2017-03-28 16:08:39.000000000 +0200
-+++ gfs2-utils-3.1.10/tests/Makefile.am	2018-05-17 05:39:56.260479669 +0200
-@@ -22,9 +22,7 @@
- 	-I$(top_srcdir)/gfs2/libgfs2 \
- 	-I$(top_srcdir)/gfs2/include
- nukerg_LDADD = \
--	$(top_builddir)/gfs2/libgfs2/libgfs2.la
--nukerg_LDFLAGS = \
--	$(uuid_LIBS)
-+	$(top_builddir)/gfs2/libgfs2/libgfs2.la $(uuid_LIBS)
- 
- if HAVE_CHECK
- UNIT_TESTS = \
-@@ -50,16 +48,14 @@
- 	$(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
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gfs2-utils.git/commitdiff/f6536fb8426c49b57771e5b2b9369bf4d4cbb24f

More information about the pld-cvs-commit mailing list