Adjust spec file to work with btrfs-progs v4.16.1

btrfs-debug-tree removed in de34a33a8204af9e675e5247c88eb727955beae1
btrfs-restore is now 'btrfs restore' command e43cc461550130494194201037590a2b1f0f6880
btrfsctl, btrfs-vol and btrfs-show removed in f243fcd1b2aa55ffadfbcc032c66dedbee56e79e
btrfs-zero-log removed in df9158f20d8950b996a3e9b5a4ac0f9b2ea034d3
btrfs-select-super introduced in b4382217f18a27be16f9a960ac3b1327c87297e7
libblkid required from 2a2d8e1962e8b6cda7b0a7584f6d2fb95d442cb6

Change-Id: I06f3c6224a39ed85db78c556b29bbfaaa80920b9

diff --git a/packaging/btrfs-progs.spec b/packaging/btrfs-progs.spec
index 2eb85da..1eafff9 100644 (file)
--- a/packaging/btrfs-progs.spec
+++ b/packaging/btrfs-progs.spec
@@ -1,5 +1,5 @@
 Name:           btrfs-progs
-Version:        0.20.rc1
+Version:        4.16.1
 Release:        0
 Summary:        Utilities for the Btrfs filesystem
 Group:          Base/File Systems
@@ -9,6 +9,7 @@ Source:         %{name}-%{version}.tar.xz
 Source1001:    btrfs-progs.manifest
 BuildRequires:  libacl-devel
 BuildRequires:  lzo-devel
+BuildRequires:  libblkid-devel
 BuildRequires:  pkgconfig(ext2fs)
 BuildRequires:  pkgconfig(uuid)
 BuildRequires:  pkgconfig(zlib)
@@ -23,11 +24,18 @@ Utilities needed to create and maintain btrfs file systems under Linux.
 cp %{SOURCE1001} .
 
 %build
+%autogen
+%configure --disable-documentation --disable-python --disable-zstd
 make %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot} prefix=%{_prefix} bindir=%{_sbindir} mandir=%{_mandir}
-ln -s %{_sbindir}/btrfsck %{buildroot}%{_sbindir}/fsck.btrfs
+
+
+rm -rf %{buildroot}%{_includedir}/btrfs/
+rm -rf %{buildroot}%{_includedir}/btrfsutil.h
+rm -rf %{buildroot}%{_libdir}/libbtrfs*
+rm -rf %{buildroot}%{_libdir}/libbtrfsutil*
 
 
 %docs_package
@@ -37,16 +45,11 @@ ln -s %{_sbindir}/btrfsck %{buildroot}%{_sbindir}/fsck.btrfs
 %license COPYING
 %{_sbindir}/btrfs
 %{_sbindir}/btrfs-convert
-%{_sbindir}/btrfs-debug-tree
 %{_sbindir}/btrfs-find-root
 %{_sbindir}/btrfs-image
 %{_sbindir}/btrfs-map-logical
-%{_sbindir}/btrfs-restore
-%{_sbindir}/btrfs-show
-%{_sbindir}/btrfs-vol
-%{_sbindir}/btrfs-zero-log
 %{_sbindir}/btrfsck
-%{_sbindir}/btrfsctl
+%{_sbindir}/btrfs-select-super
 %{_sbindir}/btrfstune
 %{_sbindir}/fsck.btrfs
 %{_sbindir}/mkfs.btrfs