commit f4a2acaa717dcc20e50fbc6f98a3c3e949a8f5f4
Author: Jakub Bogusz <[email protected]>
Date: Wed May 6 21:23:15 2020 +0200
- updated to 3.1.9
- updated miscfix patch
xfsdump-miscfix.patch | 24 ++++++++++++++----------
xfsdump.spec | 14 +++++++-------
2 files changed, 21 insertions(+), 17 deletions(-)
---
diff --git a/xfsdump.spec b/xfsdump.spec
index 6341606..50da42f 100644
--- a/xfsdump.spec
+++ b/xfsdump.spec
@@ -1,13 +1,12 @@
Summary: Tools for the XFS filesystem
Summary(pl.UTF-8): Narzędzia do systemu plikowego XFS
Name: xfsdump
-Version: 3.1.8
+Version: 3.1.9
Release: 1
License: GPL v2
Group: Applications/Archiving
-# TODO: use .tar.xz source
-Source0:
https://kernel.org/pub/linux/utils/fs/xfs/xfsdump/%{name}-%{version}.tar.gz
-# Source0-md5: 6963b1e4b96acfa249449db44d1df4fa
+Source0:
https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/%{name}-%{version}.tar.xz
+# Source0-md5: 086f7582875b14c17522867ffe3e202b
Patch0: %{name}-miscfix.patch
Patch1: %{name}-pl.po-update.patch
URL: http://www.xfs.org/
@@ -17,7 +16,9 @@ BuildRequires: automake
BuildRequires: gettext-tools
BuildRequires: libuuid-devel
BuildRequires: ncurses-devel
+BuildRequires: tar >= 1:1.22
BuildRequires: xfsprogs-devel >= 2.6.9
+BuildRequires: xz
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sbindir /sbin
@@ -68,13 +69,12 @@ używane włącznie z pełną kopią.
%{__aclocal} -I m4
%{__autoconf}
%{__cp} include/install-sh .
-CPPFLAGS="-I/usr/include/ncurses"
+CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
%configure \
DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}" \
OPTIMIZER="%{rpmcflags} %{rpmcppflags} -I/usr/include/ncurses"
%{__make} \
- LIBUUID="-luuid" \
V=1
%install
@@ -99,7 +99,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc doc/{CHANGES,README.*}
+%doc doc/{CHANGES,README.xfsdump}
%attr(755,root,root) %{_sbindir}/xfsdump
%attr(755,root,root) %{_sbindir}/xfsrestore
%attr(755,root,root) %{_sbindir}/xfsinvutil
diff --git a/xfsdump-miscfix.patch b/xfsdump-miscfix.patch
index 579536e..ea3bdf0 100644
--- a/xfsdump-miscfix.patch
+++ b/xfsdump-miscfix.patch
@@ -13,23 +13,27 @@
- done
AC_SUBST(have_zipped_manpages)
])
---- xfsdump-3.0.4/dump/Makefile~ 2010-01-13 02:53:18.000000000 +0100
-+++ xfsdump-3.0.4/dump/Makefile 2010-12-08 21:41:53.673333296 +0100
-@@ -102,7 +102,6 @@
+--- xfsdump-3.1.9/dump/Makefile.orig 2020-05-06 19:15:10.923504544 +0200
++++ xfsdump-3.1.9/dump/Makefile 2020-05-06 20:53:02.985026191 +0200
+@@ -100,9 +100,6 @@
$(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
$(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
-- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND)
$(PKG_SBIN_DIR)/$(LTCOMMAND)
+- # skip symlink when /sbin is alread symlinked to /usr/sbin, like on
Fedora
+- test $(PKG_ROOT_SBIN_DIR) -ef $(PKG_SBIN_DIR) || \
+- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND)
$(PKG_SBIN_DIR)/$(LTCOMMAND)
install-dev:
- $(COMMINCL) $(COMMON):
---- xfsdump-3.0.4/restore/Makefile~ 2010-01-13 02:53:18.000000000 +0100
-+++ xfsdump-3.0.4/restore/Makefile 2010-12-08 21:42:02.034493751 +0100
-@@ -114,7 +114,6 @@
+ .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)
+--- xfsdump-3.1.9/restore/Makefile.orig 2020-05-06 19:15:10.926837859
+0200
++++ xfsdump-3.1.9/restore/Makefile 2020-05-06 20:53:33.474861013 +0200
+@@ -114,9 +114,6 @@
$(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
$(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
-- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND)
$(PKG_SBIN_DIR)/$(LTCOMMAND)
+- # skip symlink when /sbin is alread symlinked to /usr/sbin, like on
Fedora
+- test $(PKG_ROOT_SBIN_DIR) -ef $(PKG_SBIN_DIR) || \
+- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND)
$(PKG_SBIN_DIR)/$(LTCOMMAND)
install-dev:
- $(COMMINCL) $(COMMON):
+ .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xfsdump.git/commitdiff/f4a2acaa717dcc20e50fbc6f98a3c3e949a8f5f4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
