From 3cd2f52da9ccb108495ccad25f396567e9aa3cf8 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 04:32:22 +0000 Subject: auto-import emacs-20.7-34p from emacs-20.7-34p.src.rpm --- diff --git a/emacs.spec b/emacs.spec index dbcc4f5..cde91e5 100644 --- a/emacs.spec +++ b/emacs.spec @@ -1,7 +1,7 @@ Summary: The libraries needed to run the GNU Emacs text editor. Name: emacs Version: 20.7 -Release: 34a +Release: 34p Copyright: GPL Group: Applications/Editors Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.bz2 @@ -30,8 +30,9 @@ Patch9: emacs-20.6-ia64-3.patch Patch10: emacs-20.7-manboption.patch Patch11: emacs-20.7-proto.patch Patch12: emacs-cpp-Makefile.patch +Patch13: emacs-20.4-ppc-config.patch -Patch50: emacs-20.7-s390x.patch +Patch50: emacs-20.7-s390.patch Buildroot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/install-info @@ -124,7 +125,11 @@ also need to install the emacs package in order to run Emacs. %patch11 -p1 %patch12 -p1 -%ifarch s390 s390x +%ifarch ppc +%patch13 -p1 -b .ppc +%endif + +%ifarch s390 %patch50 -p1 -b .s390 %endif @@ -396,9 +401,6 @@ fi /usr/share/pixmaps/emacs.png %changelog -* Thu May 3 2001 Oliver Paukstadt -- ported to s390x (64 Bit) - * Fri Mar 16 2001 Trond Eivind Glomsr�d - New locale.alias file for emacs-nox diff --git a/sources b/sources index 2394986..533061c 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -7c55c72e7cc8f1cb49b57b670b82dba2 emacs-20.7.tar.bz2 +2a369e104d7557991811c06f982c2ade emacs-20.7.tar.bz2 606b7415499a88b839a7cf414e3caaa8 emacs-asian.tar.bz2 88cf8dd2d19b973d0a77b4430a66008f gnus-5.8.8.tar.bz2 112c8f7493ef295fc9022feb4653eab0 leim-20.7.tar.bz2