diff --git a/lzop-1.03-gcc6.patch b/lzop-1.03-gcc6.patch new file mode 100644 index 0000000..9bd8a6b --- /dev/null +++ b/lzop-1.03-gcc6.patch @@ -0,0 +1,26 @@ +--- src/miniacc.h.orig 2016-02-10 16:09:23.247315866 +0100 ++++ src/miniacc.h 2016-02-10 16:12:14.973297054 +0100 +@@ -4469,12 +4469,12 @@ + #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150) + #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) + #else +- ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0) ++ ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0) + #endif + ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0) + #if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) + #else +- ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0) ++ ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0) + #endif + ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0) + #if defined(acc_int16e_t) +@@ -4703,7 +4703,7 @@ + #elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC) + #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) + #elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1) +- ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) ++ ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) + #endif + #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560)) + # pragma option pop diff --git a/lzop.spec b/lzop.spec index 02b1842..877fbb7 100644 --- a/lzop.spec +++ b/lzop.spec @@ -1,12 +1,13 @@ Summary: Real-time file compressor Name: lzop Version: 1.03 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ Group: Applications/Archiving URL: http://www.lzop.org/ Source: http://www.lzop.org/download/%{name}-%{version}.tar.gz Patch0: lzop-1.03-gcc5_ppc64.patch +Patch1: lzop-1.03-gcc6.patch BuildRequires: lzo-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,6 +22,7 @@ to gzip. %prep %setup -q %patch0 -p1 -b .gcc5_ppc64 +%patch1 -p0 -b .gcc6 %build %configure @@ -42,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man?/%{name}.* %changelog +* Tue Mar 08 2016 Robert Scheck - 1.03-15 +- Added patch from openSUSE to fix building using GCC 6 (#1307760) + * Thu Feb 04 2016 Fedora Release Engineering - 1.03-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild