btrfs-progs 6.0-1 (aarch64;x86_64;znver1) 2022-15916
-9999

Status rejected
Submitter alexander [@T] mezon.ru
Platform rolling
Repository main
URL https://abf.openmandriva.org/build_lists/240873
Packages
btrfs-progs-6.0-1.aarch64.binary
btrfs-progs-6.0-1.aarch64.source
btrfs-progs-debuginfo-6.0-1.aarch64.debuginfo
btrfs-progs-debugsource-6.0-1.aarch64.binary
lib64btrfs-devel-6.0-1.aarch64.binary
lib64btrfs0-6.0-1.aarch64.binary
lib64btrfs0-debuginfo-6.0-1.aarch64.debuginfo
lib64btrfsutil1-6.0-1.aarch64.binary
lib64btrfsutil1-debuginfo-6.0-1.aarch64.debuginfo
btrfs-progs-6.0-1.x86_64.source
btrfs-progs-6.0-1.x86_64.binary
btrfs-progs-debuginfo-6.0-1.x86_64.debuginfo
btrfs-progs-debugsource-6.0-1.x86_64.binary
lib64btrfs-devel-6.0-1.x86_64.binary
lib64btrfs0-6.0-1.x86_64.binary
lib64btrfs0-debuginfo-6.0-1.x86_64.debuginfo
lib64btrfsutil1-6.0-1.x86_64.binary
lib64btrfsutil1-debuginfo-6.0-1.x86_64.debuginfo
btrfs-progs-6.0-1.znver1.source
btrfs-progs-6.0-1.znver1.binary
btrfs-progs-debuginfo-6.0-1.znver1.debuginfo
btrfs-progs-debugsource-6.0-1.znver1.binary
lib64btrfs-devel-6.0-1.znver1.binary
lib64btrfs0-6.0-1.znver1.binary
lib64btrfs0-debuginfo-6.0-1.znver1.debuginfo
lib64btrfsutil1-6.0-1.znver1.binary
lib64btrfsutil1-debuginfo-6.0-1.znver1.debuginfo
Build Date 2022-10-14 15:16:38 +0000 UTC
Last Updated 2022-10-17 16:45:51.812187988 +0000 UTC
$ git diff --patch-with-stat --summary 5565857a2eb3b6ec967568f2d7ca2f463a7a111c..4c6738024e9d774e75b102811e4cbc5aaf1453c6

 .abf.yml         |   2 +-
 btrfs-progs.spec | 104 ++++++++++++++++++++++---------------------------------
 2 files changed, 43 insertions(+), 63 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index 700e77d..3fff518 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  btrfs-progs-v5.16.1.tar.xz: 211e146f92d810eeec571b2e1d81b028ce8202fc
+  btrfs-progs-v6.0.tar.xz: 92ac68fa8cede704c8f4442c053c8ee31cc6ac34
diff --git a/btrfs-progs.spec b/btrfs-progs.spec
index faf5a64..5d162f4 100644
--- a/btrfs-progs.spec
+++ b/btrfs-progs.spec
@@ -4,12 +4,12 @@
 %define libutilname %mklibname btrfsutil %{majorutil}
 %define devname %mklibname -d btrfs
 %global optflags %{optflags} -Oz
-%bcond_without	docs
-#define beta rc1
+
+%bcond_without docs
 
 Summary:	Userspace programs for btrfs
 Name:		btrfs-progs
-Version:	5.16.1
+Version:	6.0
 Release:	1
 Group:		System/Kernel and hardware
 License:	GPLv2
@@ -17,16 +17,16 @@ URL:		http://btrfs.wiki.kernel.org/
 Source0:	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/%{name}-v%{version}%{?beta:-%{beta}}.tar.xz
 # From http://www.spinics.net/lists/linux-btrfs/msg15899.html
 Source1:	btrfs-completion.sh
-BuildRequires:	acl-devel
+BuildRequires:	pkgconfig(libacl)
 BuildRequires:	asciidoc
 %if %{with docs}
 BuildRequires:	docbook-dtd45-xml
 BuildRequires:	docbook-style-xsl
 BuildRequires:	xmlto
 %endif
-BuildRequires:	lzo-devel
-BuildRequires:	gd-devel
-BuildRequires:	jpeg-devel
+BuildRequires:	pkgconfig(lzo2)
+BuildRequires:	pkgconfig(gdlib)
+BuildRequires:	pkgconfig(libjpeg)
 BuildRequires:	pkgconfig(blkid)
 BuildRequires:	pkgconfig(ext2fs)
 BuildRequires:	pkgconfig(freetype2)
@@ -37,7 +37,8 @@ BuildRequires:	pkgconfig(libzstd)
 BuildRequires:	pkgconfig(libudev)
 BuildRequires:	pkgconfig(python)
 BuildRequires:	python3egg(setuptools)
-BuildRequires:	systemd-macros
+BuildRequires:	python3dist(sphinx)
+BuildRequires:	systemd-rpm-macros
 
 %description
 The btrfs-progs package provides all the userspace programs needed to create,
@@ -47,7 +48,7 @@ check, modify and correct any inconsistencies in the btrfs filesystem.
 Summary:	Library for btrfs
 Group:		System/Libraries
 
-%description -n	%{libname}
+%description -n %{libname}
 This package contains libraries for creating, checking, modifying and
 correcting any inconsistiencies in the btrfs filesystem.
 
@@ -58,11 +59,11 @@ Provides:	btrfs-devel = %{EVRD}
 Requires:	%{libname} = %{EVRD}
 Requires:	%{libutilname} = %{EVRD}
 
-%description -n	%{devname}
+%description -n %{devname}
 This package contains headers & libraries for developing programs to create,
 check, modify or correct any inconsistiencies in the btrfs filesystem.
 
-%package -n     %{libutilname}
+%package -n %{libutilname}
 Summary:	Util library for btrfs
 Group:		System/Libraries
 
@@ -78,8 +79,6 @@ export UDEVDIR=%{_udevrulesdir}
 
 ./autogen.sh
 %configure \
-	--bindir=/sbin \
-	--libdir=/%{_lib} \
 %if !%{with docs}
 	--disable-documentation \
 %endif
@@ -89,12 +88,6 @@ export UDEVDIR=%{_udevrulesdir}
 
 %install
 %make_install
-rm -f %{buildroot}/%{_lib}/libbtrfs.so
-rm -f %{buildroot}/%{_lib}/libbtrfsutil.so
-
-mkdir -p %{buildroot}%{_libdir}
-ln -sr %{buildroot}/%{_lib}/libbtrfs.so.%{major}.* %{buildroot}%{_libdir}/libbtrfs.so
-ln -sr %{buildroot}/%{_lib}/libbtrfsutil.so.%{majorutil}.* %{buildroot}%{_libdir}/libbtrfsutil.so
 
 install -p -m644 %{SOURCE1} -D %{buildroot}%{_datadir}/bash-completion/completions/btrfs
 
@@ -102,57 +95,44 @@ install -p -m644 %{SOURCE1} -D %{buildroot}%{_datadir}/bash-completion/completio
 install -m755 -d %{buildroot}%{_udevrulesdir}
 install -m644 64-btrfs-dm.rules %{buildroot}%{_udevrulesdir}
 
-mkdir -p %{buildroot}%{_libdir}
-mv %{buildroot}/%{_lib}/pkgconfig %{buildroot}%{_libdir}
-
 %files
-/sbin/btrfs
-/sbin/btrfs-convert
-/sbin/btrfs-find-root
-/sbin/btrfs-image
-/sbin/btrfs-map-logical
-/sbin/btrfsck
-/sbin/btrfstune
-/sbin/btrfs-select-super
-/sbin/fsck.btrfs
-/sbin/mkfs.btrfs
+%{_bindir}/*
 %if %{with docs}
-%{_mandir}/man5/btrfs.5*
-%{_mandir}/man8/btrfs.8*
-%{_mandir}/man8/btrfs-balance.8*
-%{_mandir}/man8/btrfs-convert.8*
-%{_mandir}/man8/btrfs-check.8*
-%{_mandir}/man8/btrfs-device.8*
-%{_mandir}/man8/btrfs-filesystem.8*
-%{_mandir}/man8/btrfs-find-root.8*
-%{_mandir}/man8/btrfs-image.8*
-%{_mandir}/man8/btrfs-inspect-internal.8*
-%{_mandir}/man8/btrfs-map-logical.8*
-%{_mandir}/man8/btrfs-property.8*
-%{_mandir}/man8/btrfs-qgroup.8*
-%{_mandir}/man8/btrfs-quota.8*
-%{_mandir}/man8/btrfs-receive.8*
-%{_mandir}/man8/btrfs-replace.8*
-%{_mandir}/man8/btrfs-rescue.8*
-%{_mandir}/man8/btrfs-restore.8*
-%{_mandir}/man8/btrfs-select-super.8*
-%{_mandir}/man8/btrfs-scrub.8*
-%{_mandir}/man8/btrfs-send.8*
-%{_mandir}/man8/btrfs-subvolume.8*
-%{_mandir}/man8/btrfsck.8*
-%{_mandir}/man8/btrfstune.8*
-%{_mandir}/man8/fsck.btrfs.8*
-%{_mandir}/man8/mkfs.btrfs.8*
+%doc %{_mandir}/man5/btrfs.5*
+%doc %{_mandir}/man8/btrfs.8*
+%doc %{_mandir}/man8/btrfs-balance.8*
+%doc %{_mandir}/man8/btrfs-convert.8*
+%doc %{_mandir}/man8/btrfs-check.8*
+%doc %{_mandir}/man8/btrfs-device.8*
+%doc %{_mandir}/man8/btrfs-filesystem.8*
+%doc %{_mandir}/man8/btrfs-find-root.8*
+%doc %{_mandir}/man8/btrfs-image.8*
+%doc %{_mandir}/man8/btrfs-inspect-internal.8*
+%doc %{_mandir}/man8/btrfs-map-logical.8*
+%doc %{_mandir}/man8/btrfs-property.8*
+%doc %{_mandir}/man8/btrfs-qgroup.8*
+%doc %{_mandir}/man8/btrfs-quota.8*
+%doc %{_mandir}/man8/btrfs-receive.8*
+%doc %{_mandir}/man8/btrfs-replace.8*
+%doc %{_mandir}/man8/btrfs-rescue.8*
+%doc %{_mandir}/man8/btrfs-restore.8*
+%doc %{_mandir}/man8/btrfs-select-super.8*
+%doc %{_mandir}/man8/btrfs-scrub.8*
+%doc %{_mandir}/man8/btrfs-send.8*
+%doc %{_mandir}/man8/btrfs-subvolume.8*
+%doc %{_mandir}/man8/btrfsck.8*
+%doc %{_mandir}/man8/btrfstune.8*
+%doc %{_mandir}/man8/fsck.btrfs.8*
+%doc %{_mandir}/man8/mkfs.btrfs.8*
 %endif
 %{_datadir}/bash-completion/completions/btrfs
-%{_udevrulesdir}/64-btrfs-dm.rules
-%{_udevrulesdir}/64-btrfs-zoned.rules
+%{_udevrulesdir}/*.rules
 
 %files -n %{libname}
-/%{_lib}/libbtrfs.so.%{major}*
+%{_libdir}/libbtrfs.so.%{major}*
 
 %files -n %{libutilname}
-/%{_lib}/libbtrfsutil.so.%{majorutil}*
+%{_libdir}/libbtrfsutil.so.%{majorutil}*
 
 %files -n %{devname}
 %doc INSTALL
Not Available

benbullard79 [@T] cox.netNo Comment.106d 20hrs
benbullard79 [@T] cox.netNo Comment.103d 19hrs
benbullard79 [@T] cox.netNo Comment.103d 19hrs