diff --git a/jfsutils.spec b/jfsutils.spec index 5fb95fd..5104548 100644 --- a/jfsutils.spec +++ b/jfsutils.spec @@ -1,14 +1,14 @@ Summary: Utilities for managing the JFS filesystem Name: jfsutils Version: 1.1.15 -Release: 12%{?dist} +Release: 13%{?dist} Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: jfsutils-1.1.15_stdint.patch Patch1: jfsutils_format-security_ftbs.patch +Patch2: jfsutils_sysmacros.patch URL: http://jfs.sourceforge.net/ Group: System Environment/Base License: GPLv2+ -Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Buildrequires: libuuid-devel BuildRequires: gcc @@ -29,6 +29,7 @@ into a file; xpeek - shell-type JFS file system editor. find . -type f -name *.[ch] -exec chmod -x {} \; %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure @@ -44,6 +45,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %doc AUTHORS COPYING NEWS ChangeLog %changelog +* Mon Oct 15 2018 François Cami - 1.1.15-13 +- Fix rhbz#1604441 (FTBFS) + * Fri Jul 13 2018 Fedora Release Engineering - 1.1.15-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/jfsutils_sysmacros.patch b/jfsutils_sysmacros.patch new file mode 100644 index 0000000..82f9d63 --- /dev/null +++ b/jfsutils_sysmacros.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/580056 + +--- a/libfs/devices.c ++++ b/libfs/devices.c +@@ -30,6 +30,10 @@ + #include + #include + ++#if HAVE_SYS_SYSMACROS_H ++#include ++#endif ++ + #ifdef HAVE_SYS_MOUNT_H + #ifdef HAVE_SYS_PARAM_H + #include