Hello community, here is the log from the commit of package emacs for openSUSE:Factory checked in at 2015-12-01 10:01:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emacs (Old) and /work/SRC/openSUSE:Factory/.emacs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "emacs" Changes: -------- --- /work/SRC/openSUSE:Factory/emacs/emacs.changes 2015-09-11 09:00:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs.changes 2015-12-01 10:01:32.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Nov 13 09:43:53 UTC 2015 - [email protected] + +- 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 - [email protected] + +- 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. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.spec ++++++ --- /var/tmp/diff_new_pack.0SIKfh/_old 2015-12-01 10:01:36.000000000 +0100 +++ /var/tmp/diff_new_pack.0SIKfh/_new 2015-12-01 10:01:36.000000000 +0100 @@ -42,6 +42,9 @@ %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 @@ 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 @@ 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 @@ %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) ++++++ emacs-24.4-glibc.patch ++++++ --- /var/tmp/diff_new_pack.0SIKfh/_old 2015-12-01 10:01:36.000000000 +0100 +++ /var/tmp/diff_new_pack.0SIKfh/_new 2015-12-01 10:01:36.000000000 +0100 @@ -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 ++++++ --- /var/tmp/diff_new_pack.0SIKfh/_old 2015-12-01 10:01:36.000000000 +0100 +++ /var/tmp/diff_new_pack.0SIKfh/_new 2015-12-01 10:01:36.000000000 +0100 @@ -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 \
