- x32 rebuild

[packages/emacs.git] / emacs.spec

diff --git a/emacs.spec b/emacs.spec
index 66ffccf5793d89888f393d89a1397abf2aba2073..b57623a608708950f0c33558c9ded3de0bc67ff9 100644 (file)
--- a/emacs.spec
+++ b/emacs.spec
@@ -20,7 +20,7 @@ Summary(tr.UTF-8):    GNU Emacs
 Name:          emacs
 %define        ver     24.3
 Version:       %{ver}
-Release:       4
+Release:       7
 License:       GPL v3+
 Group:         Applications/Editors/Emacs
 Source0:       ftp://ftp.gnu.org/pub/gnu/emacs/%{name}-%{version}.tar.xz
@@ -35,6 +35,7 @@ Source7:      %{name}-gtk.desktop
 Source8:       %{name}-motif.desktop
 Source9:       %{name}-nox.desktop
 Patch0:                %{name}-fontconfig.patch
+Patch1:                %{name}-giflib.patch
 URL:           http://www.gnu.org/software/emacs/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -48,7 +49,7 @@ BuildRequires:        libtiff-devel
 BuildRequires: libtool
 BuildRequires: giflib-devel
 BuildRequires: ncurses-devel
-%{?with_motif:BuildRequires:   openmotif-devel}
+%{?with_motif:BuildRequires:   motif-devel}
 BuildRequires: pkgconfig
 BuildRequires: rpm-pythonprov
 BuildRequires: sed >= 4.0
@@ -370,6 +371,7 @@ exit 1
 
 %setup -q -n %{name}-%{ver}
 %patch0 -p1
+%patch1 -p1
 
 %build
 cp -f /usr/share/automake/config.* .
@@ -581,11 +583,11 @@ fi
 %dir %{_libdir}/emacs/%{ver}
 %dir %{_libdir}/emacs/%{ver}/*
 
-%attr(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux/hexl
-%attr(2755,root,mail) %{_libdir}/emacs/%{ver}/*-linux/movemail
-%attr(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux/profile
-%attr(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux/rcs2log
-%attr(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux/update-game-score
+%attr(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux*/hexl
+%attr(2755,root,mail) %{_libdir}/emacs/%{ver}/*-linux*/movemail
+%attr(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux*/profile
+%attr(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux*/rcs2log
+%attr(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux*/update-game-score
 
 %dir %{_datadir}/emacs
 %dir %{_datadir}/emacs/%{ver}