diff --git a/beecrypt-4.1.2.diff b/beecrypt-4.1.2.diff index cff3eba..e14e9bf 100644 --- a/beecrypt-4.1.2.diff +++ b/beecrypt-4.1.2.diff @@ -1,5 +1,7 @@ ---- beecrypt-4.1.2/Makefile.am.orig 2004-12-22 07:06:31.000000000 +0000 -+++ beecrypt-4.1.2/Makefile.am 2006-11-24 14:08:27.000000000 +0000 +Index: beecrypt-4.1.2/Makefile.am +=================================================================== +--- beecrypt-4.1.2/Makefile.am.orig ++++ beecrypt-4.1.2/Makefile.am @@ -49,7 +49,7 @@ libaltdir=$(prefix)/lib@LIBALT@ libalt_LTLIBRARIES = libbeecrypt.la @@ -21,8 +23,10 @@ + bench: (cd tests && $(MAKE) $(AM_MAKEFLAGS) bench) ---- beecrypt-4.1.2/base64.c.orig 2004-12-19 20:21:04.000000000 +0000 -+++ beecrypt-4.1.2/base64.c 2006-11-24 14:08:27.000000000 +0000 +Index: beecrypt-4.1.2/base64.c +=================================================================== +--- beecrypt-4.1.2/base64.c.orig ++++ beecrypt-4.1.2/base64.c @@ -253,7 +253,6 @@ char* b64encode(const void* data, size_t unsigned c; @@ -31,8 +35,10 @@ if (ns == 0) ns = strlen((const char*) s); nt = ((ns + 2) / 3) * 4; ---- beecrypt-4.1.2/c++/io/DataOutputStream.cxx.orig 2004-11-04 12:38:15.000000000 +0000 -+++ beecrypt-4.1.2/c++/io/DataOutputStream.cxx 2006-11-24 14:09:35.000000000 +0000 +Index: beecrypt-4.1.2/c++/io/DataOutputStream.cxx +=================================================================== +--- beecrypt-4.1.2/c++/io/DataOutputStream.cxx.orig ++++ beecrypt-4.1.2/c++/io/DataOutputStream.cxx @@ -126,8 +126,8 @@ void DataOutputStream::writeLong(javalon void DataOutputStream::writeChar(javaint v) throw (IOException) { diff --git a/ppc64le.diff b/ppc64le.diff new file mode 100644 index 0000000..aa123d8 --- /dev/null +++ b/ppc64le.diff @@ -0,0 +1,93 @@ +diff -Nur installplatform.old installplatform +--- installplatform.old 2013-11-06 19:34:36.446381950 +0100 ++++ installplatform 2013-11-06 19:38:24.617417000 +0100 +@@ -54,12 +54,18 @@ + CANONARCH=s390x + CANONCOLOR=3 + ;; +- ppc64*) ++ ppc64|ppc64p7) + ISANAME=ppc + ISABITS=64 + CANONARCH=ppc64 + CANONCOLOR=3 + ;; ++ ppc64le) ++ ISANAME=ppc ++ ISABITS=64 ++ CANONARCH=ppc64le ++ CANONCOLOR=3 ++ ;; + ppc*) + ISANAME=ppc + ISABITS=32 +diff -Nur lib/rpmrc.c.orig lib/rpmrc.c +--- lib/rpmrc.c.orig 2013-11-06 19:34:36.426381894 +0100 ++++ lib/rpmrc.c 2013-11-06 19:38:32.713558000 +0100 +@@ -1119,6 +1119,7 @@ + # endif /* sparc*-linux */ + + # if defined(__linux__) && defined(__powerpc__) ++# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ + { + int powerlvl; + if (!rstreq(un.machine, "ppc") && +@@ -1127,6 +1128,7 @@ + strcpy(un.machine, "ppc64p7"); + } + } ++# endif /* __ORDER_BIG_ENDIAN__ */ + # endif /* ppc64*-linux */ + + # if defined(__GNUC__) && defined(__alpha__) +diff -Nurrpmrc.in.orig rpmrc.in +--- rpmrc.in 2013-11-06 19:34:36.446381950 +0100 ++++ rpmrc.in 2013-11-06 19:41:21.698505000 +0100 +@@ -48,6 +48,7 @@ + optflags: ppciseries -O2 -g -m32 + optflags: ppcpseries -O2 -g -m32 + optflags: ppc64 -O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables ++optflags: ppc64le -O2 -g -fsigned-char + optflags: ppc64p7 -O3 -mtune=power7 -mcpu=power7 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables + + optflags: parisc -O2 -g -mpa-risc-1-0 +@@ -99,6 +100,7 @@ + archcolor: sparcv9 2 + archcolor: ppc 1 + archcolor: ppc64 2 ++archcolor: ppc64le 2 + + archcolor: armv3l 1 + archcolor: armv4b 1 +@@ -201,6 +203,7 @@ + arch_canon: s390x: s390x 15 + + arch_canon: ppc64: ppc64 16 ++arch_canon: ppc64le: ppc64le 16 + arch_canon: ppc64pseries: ppc64pseries 16 + arch_canon: ppc64iseries: ppc64iseries 16 + arch_canon: ppc64p7: ppc64p7 16 +@@ -288,6 +291,7 @@ + buildarchtranslate: ppc64iseries: ppc64 + buildarchtranslate: ppc64pseries: ppc64 + buildarchtranslate: ppc64p7: ppc64 ++buildarchtranslate: ppc64le: ppc64le + buildarchtranslate: powerpc64: ppc64 + + buildarchtranslate: armv3l: armv3l +@@ -373,6 +377,7 @@ + arch_compat: ppc64pseries: ppc64 + arch_compat: ppc64iseries: ppc64 + arch_compat: ppc64p7: ppc64 ++arch_compat: ppc64le: noarch fat + + arch_compat: sun4c: sparc + arch_compat: sun4d: sparc +@@ -507,6 +512,7 @@ + buildarch_compat: ppc64pseries: ppc64 + buildarch_compat: ppc64iseries: ppc64 + buildarch_compat: ppc64p7: ppc64 ++buildarch_compat: ppc64le: noarch fat + + buildarch_compat: mips: noarch + buildarch_compat: mipsel: noarch diff --git a/rpm.changes b/rpm.changes index 8309201..381c54f 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Nov 6 18:07:49 UTC 2013 - dvaleev@suse.com + +- Add support for ppc64le (ppc64le.diff) + those are upstream commits: + ef1497b1f81966fed56f008bc8ee8ba42102efd6 + cf07feda05822377d62b973adc4010c0d7f9eaa0 + ------------------------------------------------------------------- Wed Oct 30 10:19:00 UTC 2013 - schwab@suse.de diff --git a/rpm.spec b/rpm.spec index 51ab917..8bf41cf 100644 --- a/rpm.spec +++ b/rpm.spec @@ -142,6 +142,9 @@ Patch87: ignore_poolstr_dummy_entries.diff Patch88: selfconflicts.diff Patch89: application_provides.diff Patch90: appdata_provides.diff +#upstream commit cf07feda05822377d62b973adc4010c0d7f9eaa0 +#upstream commit ef1497b1f81966fed56f008bc8ee8ba42102efd6 +Patch91: ppc64le.diff Patch6464: auto-config-update-aarch64.diff Patch68000: m68k.patch Patch68001: debugedit-m68k.patch @@ -231,7 +234,8 @@ rm -f rpmdb/db.h %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 %patch -P 80 -P 81 -P 82 -P 83 -P 84 -P 85 -P 86 -P 87 -P 88 -P 89 -%patch -P 90 +%patch -P 90 -P 91 + %ifarch aarch64 %patch6464 %endif