2012-09-18 12:17:07 +00:00
committed by Git OBS Bridge
parent b2e85acb85
commit f7f16e286e
8 changed files with 80 additions and 88 deletions

View File

@@ -60,7 +60,7 @@ BuildRequires: gpm-devel
BuildRequires: gpm
%endif
Url: http://www.gnu.org/software/emacs/
Version: 24.1
Version: 24.2
Release: 0
Requires: ctags
Requires: emacs-info = %{version}
@@ -70,14 +70,14 @@ License: GPL-3.0+
Group: Productivity/Editors/Emacs
Provides: nxml-mode = 20041004
Obsoletes: nxml-mode < 20041004
Source: ftp://ftp.gnu.org/gnu/emacs/emacs-24.1.tar.bz2
Source: ftp://ftp.gnu.org/gnu/emacs/emacs-24.2.tar.xz
Source1: app-defaults.Emacs
Source2: site-lisp.tar.bz2
Source2: site-lisp.tar.xz
Source3: dot.gnu-emacs
Source4: emacs-rpmlintrc
Source5: emacs.desktop
Patch: emacs-24.1.dif
Patch1: emacs-24.1-configure.patch
Patch1: emacs-24.2-configure.patch
Patch2: emacs-24.1-glibc.patch
Patch3: emacs-24.1-decl.dif
Patch4: emacs-23.1-asian-print.patch
@@ -95,7 +95,6 @@ Patch16: emacs-23.1-flyspell.patch
Patch22: emacs-24.1-bnc628268.patch
Patch23: emacs-24.1-xevent.patch
Patch24: emacs-24.1-xgselect.patch
Patch25: emacs-24.1-gets.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global bug_345669 0
%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
@@ -204,7 +203,6 @@ fi
%patch22
%patch23
%patch24
%patch25 -p1
%if 0%{?suse_version} < 1130
%patch1
%endif
@@ -248,7 +246,7 @@ exit 1
esac
}
if test "$(sed -rn '\@^\$[({]infodir[})]/@{ s@.*/([^:]*):.*@\1@p; }' doc/*/Makefile.in | xargs)" != "%info_files"
if test "$(sed -rn '\@^\$[({](build)?infodir[})]/@{ s@.*/([^:]*):.*@\1@p; }' doc/*/Makefile.in | xargs)" != "%info_files"
then
echo Please update info_files >&2
exit 1