From 40bb50c5fc95f1afbd2cace9df1e0d606c0d242eb2edd52722d49611899b4622 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 10 Nov 2015 09:59:03 +0000 Subject: [PATCH 1/5] . 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 From 3962038de2724e89927887aa1df3e800306bb96490b282e04362a4198480485b Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 13 Nov 2015 11:13:11 +0000 Subject: [PATCH 2/5] . OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=184 --- emacs.changes | 6 ++++++ emacs.spec | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/emacs.changes b/emacs.changes index 22c4d6d..9f3f0d2 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/emacs.spec b/emacs.spec index 9702d4d..57358f4 100644 --- a/emacs.spec +++ b/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} @@ -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) From bcb874def94b81e837bf0287da1a95b71ac16c9510d9e14ed2cb6e5db879025c Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 13 Nov 2015 12:53:05 +0000 Subject: [PATCH 3/5] . OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=185 --- emacs.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/emacs.spec b/emacs.spec index 57358f4..5f40c56 100644 --- a/emacs.spec +++ b/emacs.spec @@ -254,6 +254,8 @@ fi %endif %build +echo include_info=%include_info +rpm -qf /usr/share/info/info.info.{gz,xz,bz2} 2>/dev/null # make sure that the binaries work (pagesize on build must be the same as on target, bnc#726769) %if %suse_version >= 1110 %ifarch ppc ppc64 ia64 @@ -327,7 +329,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} \ From 7c52f6e293f0f42ef4d3eb008cd8c2040f83ad242525e589510d280cb8e5e63b Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 13 Nov 2015 13:09:10 +0000 Subject: [PATCH 4/5] . OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=186 --- emacs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emacs.spec b/emacs.spec index 5f40c56..e217ff6 100644 --- a/emacs.spec +++ b/emacs.spec @@ -255,7 +255,7 @@ fi %build echo include_info=%include_info -rpm -qf /usr/share/info/info.info.{gz,xz,bz2} 2>/dev/null +rpm -qf /usr/share/info/info.info.{gz,xz,bz2} 2>/dev/null || true # make sure that the binaries work (pagesize on build must be the same as on target, bnc#726769) %if %suse_version >= 1110 %ifarch ppc ppc64 ia64 From 9def22ec03a682bc6da2c3287f3c34042e64d44de91b0e66066b41204c48ff5d Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 13 Nov 2015 13:47:27 +0000 Subject: [PATCH 5/5] . OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=187 --- emacs.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/emacs.spec b/emacs.spec index e217ff6..5694c67 100644 --- a/emacs.spec +++ b/emacs.spec @@ -254,8 +254,6 @@ fi %endif %build -echo include_info=%include_info -rpm -qf /usr/share/info/info.info.{gz,xz,bz2} 2>/dev/null || true # make sure that the binaries work (pagesize on build must be the same as on target, bnc#726769) %if %suse_version >= 1110 %ifarch ppc ppc64 ia64