From 40bb50c5fc95f1afbd2cace9df1e0d606c0d242eb2edd52722d49611899b4622 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Tue, 10 Nov 2015 09:59:03 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=183
---
 emacs-24.4-glibc.patch | 28 ----------------------------
 emacs-24.4.dif         |  4 ++--
 emacs.changes          |  8 ++++++++
 3 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/emacs-24.4-glibc.patch b/emacs-24.4-glibc.patch
index 3370868..dec2cf3 100644
--- a/emacs-24.4-glibc.patch
+++ b/emacs-24.4-glibc.patch
@@ -40,31 +40,3 @@
  esac
  
  
---- lib-src/Makefile.in
-+++ lib-src/Makefile.in	2014-10-21 13:55:07.003837593 +0000
-@@ -314,13 +314,15 @@ test-distrib${EXEEXT}: ${srcdir}/test-di
- ../lib/libgnu.a: $(config_h)
- 	cd ../lib && $(MAKE) libgnu.a
- 
-+#REGEXPOBJ =
-+REGEXPOBJ = regex.o
- regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h)
- 	${CC} -c ${CPP_CFLAGS} ${srcdir}/../src/regex.c
- 
- etags${EXEEXT}: ${srcdir}/etags.c regex.o $(NTLIB) $(config_h)
- 	$(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" \
- 	  -DVERSION="\"${version}\"" ${srcdir}/etags.c \
--	  regex.o $(LOADLIBES) $(NTLIB) -o etags${EXEEXT}
-+	  $(REGEXPOBJ) $(LOADLIBES) $(NTLIB) -o etags${EXEEXT}
- 
- ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \
-                    $(config_h)
-@@ -332,7 +334,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${
- ctags${EXEEXT}: etags${EXEEXT}
- 	$(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \
- 	  -DVERSION="\"${version}\"" ${srcdir}/etags.c \
--	  regex.o $(LOADLIBES) $(NTLIB) -o ctags${EXEEXT}
-+	  $(REGEXPOBJ) $(LOADLIBES) $(NTLIB) -o ctags${EXEEXT}
- 
- profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h)
- 	$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \
diff --git a/emacs-24.4.dif b/emacs-24.4.dif
index ecea373..fd8da92 100644
--- a/emacs-24.4.dif
+++ b/emacs-24.4.dif
@@ -182,8 +182,8 @@
 +gnuctags${EXEEXT}: etags${EXEEXT}
  	$(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \
  	  -DVERSION="\"${version}\"" ${srcdir}/etags.c \
--	  $(REGEXPOBJ) $(LOADLIBES) $(NTLIB) -o ctags${EXEEXT}
-+	  $(REGEXPOBJ) $(LOADLIBES) $(NTLIB) -o gnuctags${EXEEXT}
+-	  regex.o $(LOADLIBES) $(NTLIB) -o ctags${EXEEXT}
++	  regex.o $(LOADLIBES) $(NTLIB) -o gnuctags${EXEEXT}
  
  profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h)
  	$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \
diff --git a/emacs.changes b/emacs.changes
index 494d1e4..22c4d6d 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Nov 10 09:17:53 UTC 2015 - werner@suse.de
+
+- Do not enforce the usage of the glibc regular expression as the
+  GNU emacs ctags program depends on the emacs version (bsc#953745).
+  For this fix the patch emacs-24.4-glibc.patch and emacs-24.4.dif
+  had been modified.
+
 -------------------------------------------------------------------
 Tue Sep  1 10:05:35 UTC 2015 - werner@suse.de