From 6fff25e3bf221f5a5fb6571a2db5874a5a7cb0f9262e97beca1401d8fa102268 Mon Sep 17 00:00:00 2001
From: Pascal Bleser <pascal.bleser@opensuse.org>
Date: Tue, 3 Jan 2012 23:03:35 +0000
Subject: [PATCH] Accepting request 98678 from
 home:dirkmueller:branches:editors

- rebuild for ppc64 and ia64 (bnc#726769)

OBS-URL: https://build.opensuse.org/request/show/98678
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=68
---
 check-build.sh | 37 ++++++++++++++++++-------------------
 emacs.changes  |  5 +++++
 emacs.spec     | 17 +++++++++++++++--
 3 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/check-build.sh b/check-build.sh
index 385555f..e1501c7 100644
--- a/check-build.sh
+++ b/check-build.sh
@@ -1,21 +1,20 @@
 #!/bin/bash
-#
-# Avoid SLES10 systems using kernel 2.6.16
-#
-
-case "$(uname -i)" in
-*ppc*)
-    read -t 10 name dummy version rest < /proc/version
-    if test -z "$version" ; then
-	echo "FATAL: can not read /proc/version" 1>&2
-	exit 1
-    fi
-    OIFS="$IFS"
-    IFS='.-'
-    version=($version)
-    IFS="$OIFS"
-    if test ${version[0]} -lt 2 -o ${version[1]} -lt 6 -o ${version[2]} -lt 32 ; then
-	echo "FATAL: kernel too old, need kernel >= 2.6.32 for this package" 1>&2
-	exit 1
-    fi
+case $BUILD_BASENAME in
+   *ppc*)
+        if test $(getconf PAGESIZE) -ne 65536; then
+            echo "Error: wrong build host, PAGESIZE must be 65536"
+	    exit 1
+        fi
+	;;
+   *ia64*)
+        if test $(getconf PAGESIZE) -ne 65536; then
+            echo "Error: wrong build host, PAGESIZE must be 65536"
+	    exit 1
+        fi
+	;;
+   *)
+	;;
 esac
+
+exit 0
+
diff --git a/emacs.changes b/emacs.changes
index 457057f..53611a8 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan  3 18:01:19 CET 2012 - dmueller@suse.de
+
+- rebuild for ppc64 and ia64 (bnc#726769)
+
 -------------------------------------------------------------------
 Tue Dec 20 20:30:48 UTC 2011 - coolo@suse.com
 
diff --git a/emacs.spec b/emacs.spec
index c9be1da..b5b33d9 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package emacs
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 Name:           emacs
 BuildRequires:  alsa-devel
 BuildRequires:  autoconf
@@ -110,6 +109,7 @@ Obsoletes:      emac_nox
 Requires:       emacs = %{version}-%{release}
 Provides:       emacs_program = %{version}-%{release}, emac_nox
 Summary:        GNU Emacs-nox: An Emacs Binary without X Window System Support
+Group:          Productivity/Editors/Emacs
 
 %description -n emacs-nox
 Eight Megabytes And Constantly Swapping. Call it
@@ -126,6 +126,7 @@ Enhances:       xorg-x11-libs
 Provides:       emacs_program = %{version}-%{release} emacsbin
 Provides:       emacs:/usr/bin/emacs ge_exec:/usr/bin/emacs
 Summary:        GNU Emacs: Emacs binary with X Window System Support
+Group:          Productivity/Editors/Emacs
 
 %description -n emacs-x11
 Call it
@@ -140,6 +141,7 @@ Obsoletes:      ge_lisp
 Requires:       emacs = %{version}-%{release}
 Provides:       ge_lisp
 Summary:        Several Lisp Files for GNU Emacs
+Group:          Productivity/Editors/Emacs
 %if 0%{?suse_version} >= 1120
 BuildArch:      noarch
 %endif
@@ -152,6 +154,7 @@ files are pre-byte compiled and therefore not necessary.
 Obsoletes:      ge_info elispman elisp-manual elispint emacs-lisp-intro
 Provides:       elispman elisp-manual elispint emacs-lisp-intro ge_info
 Summary:        Info files for GNU Emacs
+Group:          Productivity/Editors/Emacs
 PreReq:         %install_info_prereq
 %if 0%{?suse_version} >= 1120
 BuildArch:      noarch
@@ -186,6 +189,16 @@ if test ! -e $HOME/.mh_profile && type -p install-mh > /dev/null 2>&1; then
 fi
 %patch22
 
+# make sure that the binaries work (pagesize on build must be the same as on target, bnc#726769)
+%if %suse_version >= 1110
+%ifarch ppc ppc64 ia64
+%if %(getconf PAGESIZE) != 65536
+%error "Error: wrong build host, PAGESIZE must be 65536"
+exit 1
+%endif
+%endif
+%endif
+
 %build
   cflags ()
   {