Accepting request 292439 from home:Andreas_Schwab:Factory

- jpeg-version-check.patch: Fix jpeg version check to work with gcc >= 5

OBS-URL: https://build.opensuse.org/request/show/292439
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=174
This commit is contained in:
2015-03-23 12:42:17 +00:00
committed by Git OBS Bridge
parent 41b6ae215e
commit 7fa23e7ddc
3 changed files with 85 additions and 1 deletions

View File

@@ -1,7 +1,7 @@
#
# spec file for package emacs
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -112,6 +112,7 @@ Patch12: emacs-24.3-x11r7.patch
Patch15: emacs-24.3-iconic.patch
Patch16: emacs-24.4-flyspell.patch
Patch22: emacs-24.1-bnc628268.patch
Patch23: jpeg-version-check.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
%if "%_exec_prefix" == "/usr/X11R6"
@@ -225,6 +226,7 @@ and most assembler-like syntaxes.
%patch15 -p0 -b .iconic
%patch16 -p0 -b .flyspell
%patch22 -p0 -b .obsolate
%patch23 -p1
%patch -p0 -b .0
%if %{without autoconf}