pool/emacs
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 134847 from editors

Browse Source 
- Update to to emacs version 24.2
  * This is mainly a bug-fix release
- Last patch already included

OBS-URL: https://build.opensuse.org/request/show/134847
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/emacs?expand=0&rev=83
This commit is contained in:
Stephan Kulow 2012-09-23 17:33:22 +00:00 committed by Git OBS Bridge
commit 5026f12468
8 changed files with 80 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
emacs-24.1-gets.patch
View File

@ -1,13 +0,0 @@
--- emacs-24.1/lib/stdio.in.h.old 2012-09-10 11:22:57.405938628 +0200
+++ emacs-24.1/lib/stdio.in.h 2012-09-10 11:24:01.071262324 +0200
@@ -715,8 +715,10 @@
/* It is very rare that the developer ever has full control of stdin,
so any use of gets warrants an unconditional warning. Assume it is
always declared, since it is required by C89. */
+#if HAVE_RAW_DECL_GETS
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
#endif
+#endif
#if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@

3
emacs-24.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eeea272732146e2be9aee2f8d71d6cf07b8654c0282da62a26b921d433f02b7c
size 41722508

124
emacs-24.1-configure.patch → emacs-24.2-configure.patch
View File

@ -3,8 +3,8 @@
@@ -1,11 +1,9 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for emacs 24.1.
+# Generated by GNU Autoconf 2.69 for emacs 24.1.
-# Generated by GNU Autoconf 2.68 for emacs 24.2.
+# Generated by GNU Autoconf 2.69 for emacs 24.2.
#
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -187,7 +187,7 @@
@@ -2134,9 +2152,9 @@ test -n "$ac_init_help" && exit $ac_stat
if $ac_init_version; then
cat <<\_ACEOF
emacs configure 24.1
emacs configure 24.2
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
@ -258,7 +258,7 @@
@@ -2863,7 +2886,7 @@ This file contains any messages produced
running configure, to aid debugging if configure makes a mistake.
It was created by emacs $as_me 24.1, which was
It was created by emacs $as_me 24.2, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
@ -383,7 +383,7 @@
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -5900,7 +5923,7 @@ do
@@ -5902,7 +5925,7 @@ do
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
@ -392,7 +392,7 @@
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
@@ -5966,7 +5989,7 @@ do
@@ -5968,7 +5991,7 @@ do
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
@ -401,7 +401,7 @@
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
@@ -6066,7 +6089,7 @@ do
@@ -6068,7 +6091,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -410,7 +410,7 @@
ac_cv_prog_AR="${ac_tool_prefix}ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6106,7 +6129,7 @@ do
@@ -6108,7 +6131,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -419,7 +419,7 @@
ac_cv_prog_ac_ct_AR="ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6173,7 +6196,7 @@ do
@@ -6175,7 +6198,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -428,7 +428,7 @@
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6213,7 +6236,7 @@ do
@@ -6215,7 +6238,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -437,7 +437,7 @@
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6476,9 +6499,9 @@ else
@@ -6478,9 +6501,9 @@ else
if test "$GCC" != yes; then
ac_save_CC=$CC
while :; do
@ -450,7 +450,7 @@
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -6487,8 +6510,8 @@ else
@@ -6489,8 +6512,8 @@ else
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
@ -461,7 +461,7 @@
int
main ()
{
@@ -6497,16 +6520,16 @@ main ()
@@ -6499,16 +6522,16 @@ main ()
return 0;
}
_ACEOF
@ -482,7 +482,7 @@
done
CC=$ac_save_CC
rm -f conftest.$ac_ext
@@ -6533,8 +6556,8 @@ else
@@ -6535,8 +6558,8 @@ else
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
@ -493,7 +493,7 @@
int
main ()
{
@@ -6557,8 +6580,8 @@ rm -f core conftest.err conftest.$ac_obj
@@ -6559,8 +6582,8 @@ rm -f core conftest.err conftest.$ac_obj
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
@ -504,7 +504,7 @@
int
main ()
{
@@ -6602,8 +6625,8 @@ else
@@ -6604,8 +6627,8 @@ else
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
@ -515,7 +515,7 @@
int
main ()
{
@@ -6626,8 +6649,8 @@ rm -f core conftest.err conftest.$ac_obj
@@ -6628,8 +6651,8 @@ rm -f core conftest.err conftest.$ac_obj
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
@ -526,7 +526,7 @@
int
main ()
{
@@ -6810,7 +6833,7 @@ main ()
@@ -6812,7 +6835,7 @@ main ()
return 0;
}
_ACEOF
@ -535,7 +535,7 @@
do
CC="$ac_save_CC $ac_arg"
if ac_fn_c_try_compile "$LINENO"; then :
@@ -6850,8 +6873,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
@@ -6852,8 +6875,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
@ -545,7 +545,7 @@
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -7340,7 +7362,7 @@ do
@@ -7342,7 +7364,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -554,7 +554,7 @@
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7380,7 +7402,7 @@ do
@@ -7382,7 +7404,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -563,7 +563,7 @@
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7452,7 +7474,7 @@ do
@@ -7459,7 +7481,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -572,7 +572,7 @@
ac_cv_path_INSTALL_INFO="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7492,7 +7514,7 @@ do
@@ -7499,7 +7521,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -581,7 +581,7 @@
ac_cv_path_INSTALL_INFO="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7532,7 +7554,7 @@ do
@@ -7539,7 +7561,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -590,7 +590,7 @@
ac_cv_path_INSTALL_INFO="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7573,7 +7595,7 @@ do
@@ -7580,7 +7602,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -599,7 +599,7 @@
ac_cv_path_GZIP_PROG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7616,7 +7638,7 @@ do
@@ -7623,7 +7645,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -608,7 +608,7 @@
ac_cv_path_MAKEINFO="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7888,9 +7910,9 @@ else
@@ -7895,9 +7917,9 @@ else
if test "$GCC" != yes; then
ac_save_CC=$CC
while :; do
@ -621,7 +621,7 @@
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -7899,8 +7921,8 @@ else
@@ -7906,8 +7928,8 @@ else
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
@ -632,7 +632,7 @@
int
main ()
{
@@ -7909,16 +7931,16 @@ main ()
@@ -7916,16 +7938,16 @@ main ()
return 0;
}
_ACEOF
@ -653,7 +653,7 @@
done
CC=$ac_save_CC
rm -f conftest.$ac_ext
@@ -7945,8 +7967,8 @@ else
@@ -7952,8 +7974,8 @@ else
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
@ -664,7 +664,7 @@
int
main ()
{
@@ -7969,8 +7991,8 @@ rm -f core conftest.err conftest.$ac_obj
@@ -7976,8 +7998,8 @@ rm -f core conftest.err conftest.$ac_obj
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
@ -675,7 +675,7 @@
int
main ()
{
@@ -8014,8 +8036,8 @@ else
@@ -8021,8 +8043,8 @@ else
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
@ -686,7 +686,7 @@
int
main ()
{
@@ -8038,8 +8060,8 @@ rm -f core conftest.err conftest.$ac_obj
@@ -8045,8 +8067,8 @@ rm -f core conftest.err conftest.$ac_obj
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
@ -697,7 +697,7 @@
int
main ()
{
@@ -8138,7 +8160,7 @@ if test "x$crt_files" != x; then
@@ -8145,7 +8167,7 @@ if test "x$crt_files" != x; then
test -e /usr/lib64/crtn.o && CRT_DIR=/usr/lib64
;;
@ -706,7 +706,7 @@
esac
case "$opsys" in
@@ -8301,7 +8323,7 @@ do
@@ -8308,7 +8330,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -715,7 +715,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8987,11 +9009,11 @@ else
@@ -8994,11 +9016,11 @@ else
int
main ()
{
@ -730,7 +730,7 @@
/* SunOS 4.1.1 cc rejects this. */
char const *const *pcpcc;
char **ppc;
@@ -9008,8 +9030,9 @@ main ()
@@ -9015,8 +9037,9 @@ main ()
++pcpcc;
ppc = (char**) pcpcc;
pcpcc = (char const *const *) ppc;
@ -742,7 +742,7 @@
char const *s = 0 ? (char *) 0 : (char const *) 0;
*t++ = 0;
@@ -9025,10 +9048,10 @@ main ()
@@ -9032,10 +9055,10 @@ main ()
iptr p = 0;
++p;
}
@ -756,7 +756,7 @@
}
{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
const int foo = 10;
@@ -9694,9 +9717,9 @@ LD_SWITCH_X_SITE_AUX=
@@ -9701,9 +9724,9 @@ LD_SWITCH_X_SITE_AUX=
LD_SWITCH_X_SITE_AUX_RPATH=
if test "${x_libraries}" != NONE; then
if test -n "${x_libraries}"; then
@ -769,7 +769,7 @@
fi
x_default_search_path=""
x_search_path=${x_libraries}
@@ -9918,7 +9941,7 @@ do
@@ -9925,7 +9948,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -778,7 +778,7 @@
ac_cv_prog_HAVE_XSERVER="true"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -10739,7 +10762,7 @@ do
@@ -10746,7 +10769,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -787,7 +787,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -10853,7 +10876,7 @@ do
@@ -10860,7 +10883,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -796,7 +796,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -10979,7 +11002,7 @@ do
@@ -10986,7 +11009,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -805,7 +805,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -11089,7 +11112,7 @@ do
@@ -11096,7 +11119,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -814,7 +814,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -11290,7 +11313,7 @@ do
@@ -11297,7 +11320,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -823,7 +823,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -11407,7 +11430,7 @@ do
@@ -11414,7 +11437,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -832,7 +832,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -11512,7 +11535,7 @@ do
@@ -11519,7 +11542,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -841,7 +841,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -11695,7 +11718,7 @@ do
@@ -11702,7 +11725,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -850,7 +850,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12349,7 +12372,7 @@ do
@@ -12356,7 +12379,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -859,7 +859,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12451,7 +12474,7 @@ do
@@ -12458,7 +12481,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -868,7 +868,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12662,7 +12685,7 @@ do
@@ -12669,7 +12692,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -877,7 +877,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12766,7 +12789,7 @@ do
@@ -12773,7 +12796,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -886,7 +886,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12918,7 +12941,7 @@ do
@@ -12925,7 +12948,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -895,7 +895,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -13644,7 +13667,7 @@ do
@@ -13651,7 +13674,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -904,7 +904,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -13977,7 +14000,7 @@ do
@@ -13984,7 +14007,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@ -913,7 +913,7 @@
ac_cv_prog_liblockfile="yes"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -23069,16 +23092,16 @@ if (echo >conf$$.file) 2>/dev/null; then
@@ -23074,16 +23097,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
@ -934,7 +934,7 @@
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -23138,28 +23161,16 @@ else
@@ -23143,28 +23166,16 @@ else
as_mkdir_p=false
fi
@ -973,19 +973,19 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -23181,7 +23192,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
@@ -23186,7 +23197,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# values after options handling.
ac_log="
This file was extended by emacs $as_me 24.1, which was
This file was extended by emacs $as_me 24.2, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -23247,10 +23258,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
@@ -23252,10 +23263,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
emacs config.status 24.1
emacs config.status 24.2
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@ -995,7 +995,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -23341,7 +23352,7 @@ fi
@@ -23346,7 +23357,7 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then

3
emacs-24.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1f11b65520611d108eceea886cc1d2573704e18b19aded8a09b75fdea7eb0ddd
size 34712012

7
emacs.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Sep 18 12:07:26 UTC 2012 - werner@suse.de
- Update to to emacs version 24.2
* This is mainly a bug-fix release
- Last patch already included
-------------------------------------------------------------------
Mon Sep 10 09:25:05 UTC 2012 - aj@suse.de

12
emacs.spec
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

3
site-lisp.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8710deb2a54e2da1065fa3bc62b18c70dc00bcbb081b553f0b0e7cfc593c2d5b
size 51829

3
site-lisp.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2aa36518411b9b21e5d93dbeefc3652e4aff791023ceabd204df25d92af74051
size 50812