Accepting request 345433 from editors

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/345433
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/emacs?expand=0&rev=120

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 \

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}
+-	  regex.o $(LOADLIBES) $(NTLIB) -o ctags${EXEEXT}
-+	  $(REGEXPOBJ) $(LOADLIBES) $(NTLIB) -o gnuctags${EXEEXT}
++	  regex.o $(LOADLIBES) $(NTLIB) -o gnuctags${EXEEXT}
  
  profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h)
  	$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \

emacs.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Nov 13 09:43:53 UTC 2015 - werner@suse.de
+
+- Make installation of info page info.info more smart, that is if
+  package info already has included it then skip a second installation
+
+-------------------------------------------------------------------
+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
 

emacs.spec

@@ -42,6 +42,9 @@ BuildRequires:  gtk3-devel
 %else
 BuildRequires:  gtk2-devel
 %endif
+# Used for installtion of info pages as well as to
+# detect if the page info.info is part of that package
+BuildRequires:  info
 BuildRequires:  krb5-devel
 BuildRequires:  libacl-devel
 BuildRequires:  libgnutls-devel
@@ -112,6 +115,7 @@ Patch15:        emacs-24.3-iconic.patch
 Patch16:        emacs-24.4-flyspell.patch
 Patch22:        emacs-24.1-bnc628268.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%{expand: %%global include_info %(test -s /usr/share/info/info.info* && echo 0 || echo 1)}
 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
 %if "%_exec_prefix" == "/usr/X11R6"
 %define _x11lib     %{_exec_prefix}/%{_lib}
@@ -323,7 +327,7 @@ LDFLAGS=
   LARGE="-DSYSTEM_PURESIZE_EXTRA=55000 \
 	 -DSITELOAD_PURESIZE_EXTRA=10000 \
 "
-   LANG=POSIX; LC_CTYPE=ISO-8859-1
+   LANG=POSIX; LC_CTYPE=en_US.UTF-8
 export CC CFLAGS LANG LC_CTYPE LDFLAGS
  PREFIX="--prefix=%{_prefix} \
 	 --mandir=%{_mandir} \
@@ -3160,7 +3164,9 @@ fi
 %files       -n emacs-info
 %defattr(-, root, root)
 %doc %{_infodir}/*.gz
+%if 0%{?include_info} == 0
 %exclude %{_infodir}/info.info.gz
+%endif
 
 %files       -n emacs-el
 %defattr(-, root, root)