Hello community, here is the log from the commit of package btrfsprogs for openSUSE:Factory checked in at 2016-09-05 21:15:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/btrfsprogs (Old) and /work/SRC/openSUSE:Factory/.btrfsprogs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "btrfsprogs" Changes: -------- --- /work/SRC/openSUSE:Factory/btrfsprogs/btrfsprogs.changes 2016-08-06 20:37:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.btrfsprogs.new/btrfsprogs.changes 2016-09-05 21:15:58.000000000 +0200 @@ -1,0 +2,29 @@ +Tue Aug 30 20:11:10 UTC 2016 - [email protected] + +- Add new btrfsprogs-udev-rules package to contain the udev rules. +- Fix packaging for udev rules: + - btrfs builtin didn't exist prior to udev v190, so the rules must + depend on that version. +- Added patch: + * btrfsprogs-only-install-udev-rules-for-udev-190.patch + +------------------------------------------------------------------- +Mon Aug 29 00:00:00 CEST 2016 - [email protected] + +- update to 4.7.1 + * check: + * new optional mode: optimized for low memory usage (memory/io tradeoff) + * --mode=lowmem, not default, still considered experimental + * does not work with --repair yet + * convert: regression fix, ext2_subvol/image rw permissions + * mkfs/convert: + * two-staged creation, partially created filesystem will not be recognized + * improved error handling (fewer BUG_ONs) + * convert: preparation for more filesystems to convert from + * documentation updates: quota, qgroup + * other + * message updates + * more tests + * more build options, enhanced debugging + +------------------------------------------------------------------- Old: ---- btrfs-progs-v4.7.tar.gz New: ---- btrfs-progs-v4.7.1.tar.gz btrfsprogs-only-install-udev-rules-for-udev-190.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ btrfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.byuZy5/_old 2016-09-05 21:15:59.000000000 +0200 +++ /var/tmp/diff_new_pack.byuZy5/_new 2016-09-05 21:15:59.000000000 +0200 @@ -16,6 +16,10 @@ # +%define udev_with_btrfs_builtin 190 +%define udev_version %(rpm -q --queryformat %{VERSION} udev) +%define package_udev_rules %{udev_version} >= %{udev_with_btrfs_builtin} + # enable building of btrfsprogs-static %if 0%{?suse_version} <= 1310 || 0%{?suse_version} == 1315 %define build_static 0 @@ -24,7 +28,7 @@ %endif Name: btrfsprogs -Version: 4.7 +Version: 4.7.1 Release: 0 Summary: Utilities for the Btrfs filesystem License: GPL-2.0 @@ -42,6 +46,7 @@ Patch168: 0168-Btrfs-progs-don-t-bug-out-if-we-can-t-find-the-last-.patch Patch1000: local-version-override.patch +Patch1001: btrfsprogs-only-install-udev-rules-for-udev-190.patch BuildRequires: asciidoc BuildRequires: autoconf @@ -56,6 +61,9 @@ BuildRequires: suse-module-tools %endif BuildRequires: udev +%if 0%{?suse_version} == 1310 +BuildRequires: libudev-devel +%endif BuildRequires: xmlto BuildRequires: zlib-devel %if 0%{?suse_version} >= 1310 @@ -64,6 +72,9 @@ %endif Supplements: filesystem(btrfs) Recommends: btrfsmaintenance +%if %{package_udev_rules} +Requires: btrfsprogs-udev-rules +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -107,12 +118,31 @@ This package contains the libraries and headers files for developers to build applications to interface with btrfs. +# rpm < 4.6.0 (SLE11 uses 4.4) doesn't support noarch subpackages. +# Fortunately, it doesn't use systemd either so we can just skip it. +%if %{package_udev_rules} +%package udev-rules +Summary: Udev rules for configuring btrfs file systems +Group: System/Kernel +Conflicts: udev < %{udev_with_btrfs_builtin} +BuildArch: noarch + +%description udev-rules +This package contains the udev rule file for configuring device mapper +devices that are components of btrfs file systems. It is meant to be +used with versions of udev that contain the "built-in" btrfs command +(v190 and newer). Older versions of udev will call the version of +"btrfs ready" contained in the btrfsprogs package, which does the right +thing. +%endif + %prep %setup -q -n btrfs-progs-v%{version} %patch163 -p1 %patch167 -p1 %patch168 -p1 %patch1000 -p1 +%patch1001 -p1 %build ./autogen.sh @@ -168,11 +198,6 @@ install -m 0755 -d %{buildroot}/%{_datadir}/bash-completion/completions install -m 0644 btrfs-completion %{buildroot}/%{_datadir}/bash-completion/completions/btrfs -# 13.1 does not have pkg-config but does have rules -%if 0%{?suse_version} == 1310 -install -m 0755 -d %{buildroot}/usr/lib/udev/rules.d/64-btrfs-dm.rules -%endif - %if 0%{!?for_debugging:1} DEBUG_FILES="/sbin/btrfs-find-root %{_sbindir}/btrfs-find-root @@ -262,11 +287,6 @@ %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/btrfs -%if 0%{?suse_version} >= 1200 -%dir %{_udevrulesdir} -%{_udevrulesdir}/64-btrfs-dm.rules -%endif - %if 0%{?for_debugging:1} /sbin/btrfs-find-root %{_sbindir}/btrfs-find-root @@ -304,4 +324,11 @@ %{_includedir}/btrfs/* %{_libdir}/libbtrfs.so +%if %{package_udev_rules} +%files udev-rules +%defattr(-, root, root) +%dir %{_udevrulesdir} +%{_udevrulesdir}/64-btrfs-dm.rules +%endif + %changelog ++++++ btrfs-progs-v4.7.tar.gz -> btrfs-progs-v4.7.1.tar.gz ++++++ ++++ 7818 lines of diff (skipped) ++++++ btrfsprogs-only-install-udev-rules-for-udev-190.patch ++++++ From: Jeff Mahoney <[email protected]> Subject: btrfsprogs: only install udev rules for udev >= 190 Patch-mainline: Submitted, linux-btrfs 30 Aug 2016 Prior to udev v190, there was no btrfs builtin helper. Installing it on systems with an older udev will cause problems. Signed-off-by: Jeff Mahoney <[email protected]> --- configure.ac | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 97e89f2..8fd8f42 100644 --- a/configure.ac +++ b/configure.ac @@ -161,7 +161,13 @@ PKG_STATIC(UUID_LIBS_STATIC, [uuid]) PKG_CHECK_MODULES(ZLIB, [zlib]) PKG_STATIC(ZLIB_LIBS_STATIC, [zlib]) -UDEVDIR="$(pkg-config udev --variable=udevdir)" +# udev v190 introduced the btrfs builtin and a udev rule to use it. +# Our udev rule gives us the friendly dm names but isn't required (or valid) +# on earlier releases. +UDEVDIR= +if pkg-config udev --atleast-version 190; then + UDEVDIR="$(pkg-config udev --variable=udevdir)" +fi AC_SUBST(UDEVDIR) dnl lzo library does not provide pkg-config, let use classic way ++++++ local-version-override.patch ++++++ --- /var/tmp/diff_new_pack.byuZy5/_old 2016-09-05 21:16:00.000000000 +0200 +++ /var/tmp/diff_new_pack.byuZy5/_new 2016-09-05 21:16:00.000000000 +0200 @@ -6,8 +6,8 @@ # Copyright 2008, Oracle # Released under the GNU GPLv2 --v="v4.7" -+v="v4.7+20160729" +-v="v4.7.1" ++v="v4.7.1+20160829" opt=$1
