From 15dbcaeccdc90a74a54533051f6e6c5d59cb9b8c Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Oct 18 2014 06:25:47 +0000 Subject: Looks like a perl package becomes independent of the texinfo since f21. --- diff --git a/cln-add-aarch64.patch b/cln-add-aarch64.patch deleted file mode 100644 index c837b7c..0000000 --- a/cln-add-aarch64.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/include/cln/object.h b/include/cln/object.h -index 3a47117..376baf8 100644 ---- a/include/cln/object.h -+++ b/include/cln/object.h -@@ -22,7 +22,7 @@ namespace cln { - #if defined(__m68k__) - #define cl_word_alignment 2 - #endif --#if defined(__i386__) || defined(__mips__) || defined(__mipsel__) || (defined(__sparc__) && !defined(__arch64__)) || defined(__hppa__) || defined(__arm__) || defined(__rs6000__) || defined(__m88k__) || defined(__convex__) || (defined(__s390__) && !defined(__s390x__)) || defined(__sh__) || (defined(__x86_64__) && defined(__ILP32__)) -+#if defined(__i386__) || defined(__mips__) || defined(__mipsel__) || (defined(__sparc__) && !defined(__arch64__)) || defined(__hppa__) || defined(__arm__) || defined(__rs6000__) || defined(__m88k__) || defined(__convex__) || (defined(__s390__) && !defined(__s390x__)) || defined(__sh__) || (defined(__x86_64__) && defined(__ILP32__)) || defined(__aarch64__) - #define cl_word_alignment 4 - #endif - #if defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__)) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(__s390x__) -diff --git a/include/cln/types.h b/include/cln/types.h -index ce8d7a6..9e820cd 100644 ---- a/include/cln/types.h -+++ b/include/cln/types.h -@@ -48,7 +48,7 @@ - #undef HAVE_LONGLONG - #endif - #endif -- #if defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__)) -+ #if defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__)) || defined(__aarch64__) - // 64 bit registers in hardware - #define HAVE_FAST_LONGLONG - #endif -@@ -76,7 +76,7 @@ - - // Integer type used for counters. - // Constraint: sizeof(uintC) >= sizeof(uintL) -- #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__))) -+ #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__))) || defined(__aarch64__) - #define intCsize long_bitsize - typedef long sintC; - typedef unsigned long uintC; -@@ -88,7 +88,7 @@ - - // Integer type used for lfloat exponents. - // Constraint: sizeof(uintE) >= sizeof(uintC) --#if (defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__) || defined(__i386__) || defined(__mips__) || defined(__rs6000__))) -+#if (defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__) || defined(__i386__) || defined(__mips__) || defined(__rs6000__))) || defined(__aarch64__) - #define intEsize 64 - typedef sint64 sintE; - typedef uint64 uintE; -@@ -127,7 +127,7 @@ - typedef int sintD; - typedef unsigned int uintD; - #else // we are not using GMP, so just guess something reasonable -- #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__)) || defined(__s390x__) || defined(__x86_64__))) -+ #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__)) || defined(__s390x__) || defined(__x86_64__))) || defined(__aarch64__) - #define intDsize 64 - typedef sint64 sintD; - typedef uint64 uintD; diff --git a/cln-arm-preprocessor-fix.patch b/cln-arm-preprocessor-fix.patch deleted file mode 100644 index 571bd24..0000000 --- a/cln-arm-preprocessor-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/base/digitseq/cl_asm_arm_.cc 2009-05-10 16:32:30.000000000 -0400 -+++ src/base/digitseq/cl_asm_arm_.cc.new 2009-12-29 09:03:02.161401990 -0500 -@@ -77,8 +77,8 @@ - #else - #define DECLARE_FUNCTION(x) - #endif --#define GLABEL(x) _##x##: --#define LABEL(x) x##: -+#define GLABEL(x) _##x: -+#define LABEL(x) x: - #define RRX rrx - #define END - diff --git a/cln.spec b/cln.spec index ca9c3c2..5d55499 100644 --- a/cln.spec +++ b/cln.spec @@ -8,6 +8,9 @@ Source0: http://www.ginac.de/CLN/%{name}-%{version}.tar.bz2 Patch2: cln-add-aarch64.patch BuildRequires: gmp-devel BuildRequires: texi2html +%if 0%{?fedora} && 0%{?fedora} > 20 +BuildRequires: perl(Unicode::EastAsianWidth) +%endif BuildRequires: texinfo-tex Requires(post): /sbin/install-info Requires(preun):/sbin/install-info