Accepting request 624143 from home:jeff_mahoney:branches:filesystems

- mkfs: avoid divide-by-zero when hardware reports optimal i/o size as 0
  (bsc#1089777).
  * Added xfsprogs-mkfs-avoid-divide-by-zero-when-hardware-reports-opti.patch

- Revert to %doc for license in SLE11 and SLE12.
- xfsprogs-devel should depend on uuid-devel to build on SLE11 and
  match the package's build dependencies.

OBS-URL: https://build.opensuse.org/request/show/624143
OBS-URL: https://build.opensuse.org/package/show/filesystems/xfsprogs?expand=0&rev=74

xfsprogs.spec

@@ -24,6 +24,7 @@
 %bcond_with systemd
 %endif
 %define libname libhandle1
+
 Name:           xfsprogs
 Version:        4.16.1
 Release:        0
@@ -37,6 +38,7 @@ Source2:        %{name}.keyring
 Source3:        module-setup.sh.in
 Source4:        dracut-fsck-help.txt
 Patch0:         xfsprogs-docdir.diff
+Patch1:         xfsprogs-mkfs-avoid-divide-by-zero-when-hardware-reports-opti.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libblkid-devel
@@ -84,8 +86,8 @@ library for your own new xfs tools install xfsprogs-devel.
 Summary:        XFS Filesystem-specific Static Libraries and Headers
 Group:          Development/Libraries/C and C++
 Requires:       %{libname} = %{version}
+Requires:       libuuid-devel
 Requires:       xfsprogs = %{version}
-Requires:       pkgconfig(uuid)
 
 %description devel
 xfsprogs-devel contains the libraries and header files needed to
@@ -98,6 +100,7 @@ want to install xfsprogs.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 aclocal -I m4
@@ -181,8 +184,11 @@ install -m 0644 %{SOURCE4} %{buildroot}/%{_dracutmodulesdir}/95suse-xfs/
 %{_mandir}/man[258]/*
 %doc %{_defaultdocdir}/%{name}
 %if 0%{?suse_version} >= 1315
+# SLE12 doesn't do %license
+%if 0%{?suse_version} > 1315 || 0%{?is_opensuse}
 %license doc/COPYING
 %endif
+%endif
 %dir %{_libexecdir}/dracut
 %dir %{_libexecdir}/dracut/modules.d
 %dir %{_dracutmodulesdir}/95suse-xfs/