diff --git a/SOURCES/cdrkit-1.1.11-ppc64le_elfheader.patch b/SOURCES/cdrkit-1.1.11-ppc64le_elfheader.patch new file mode 100644 index 0000000..0542b4e --- /dev/null +++ b/SOURCES/cdrkit-1.1.11-ppc64le_elfheader.patch @@ -0,0 +1,13 @@ +diff -up wrk/include/glibc_elf.h.wrk wrk/include/glibc_elf.h +--- wrk/include/glibc_elf.h.wrk 2014-09-19 16:04:45.546981432 +0200 ++++ wrk/include/glibc_elf.h 2014-09-19 16:38:55.407991682 +0200 +@@ -2081,7 +2081,8 @@ typedef Elf32_Addr Elf32_Conflict; + #define R_PPC64_DTPREL16_HIGHESTA 106 /* half16 (sym+add)@dtprel@highesta */ + + /* Keep this the last entry. */ +-#define R_PPC64_NUM 107 ++//symbol conflicting with system headers on ppc64le and nowhere used ++//#define R_PPC64_NUM 107 + + /* PowerPC64 specific values for the Dyn d_tag field. */ + #define DT_PPC64_GLINK (DT_LOPROC + 0) diff --git a/SPECS/cdrkit.spec b/SPECS/cdrkit.spec index 7310a55..cd35d8e 100644 --- a/SPECS/cdrkit.spec +++ b/SPECS/cdrkit.spec @@ -1,7 +1,7 @@ Summary: A collection of CD/DVD utilities Name: cdrkit Version: 1.1.11 -Release: 22%{?dist} +Release: 23%{?dist} License: GPLv2 Group: Applications/System URL: http://cdrkit.org/ @@ -24,6 +24,7 @@ Patch15: cdrkit-1.1.11-utf8.patch Patch16: cdrkit-1.1.11-cmakewarn.patch Patch17: cdrkit-1.1.11-memset.patch Patch18: cdrkit-1.1.11-paranoiacdio.patch +Patch19: cdrkit-1.1.11-ppc64le_elfheader.patch BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel @@ -134,6 +135,7 @@ SCSI devices. %patch16 -p1 -b .cmakewarn %patch17 -p1 -b .edcspeed %patch18 -p1 -b .paranoiacdio +%patch19 -p1 -b .elfheader # we do not want bundled paranoia library rm -rf libparanoia @@ -298,6 +300,10 @@ fi %{_includedir}/usal %changelog +* Mon Sep 22 2014 Frantisek Kluknavsky - 1.1.11-23 +- removed conflicting #define to fix FTBFS on ppc64le +- resolves:rhbz#1144072 + * Fri Jan 24 2014 Daniel Mach - 1.1.11-22 - Mass rebuild 2014-01-24