Accepting request 176851 from editors

- Remove not used spec file scriplets 
- Make pre requires more smart
- Avoid trouble with new byte compile format and old font-latex.elc

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

emacs.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue May 28 09:58:49 UTC 2013 - werner@suse.de
+
+- Remove not used spec file scriplets 
+- Make pre requires more smart
+- Avoid trouble with new byte compile format and old font-latex.elc
+
 -------------------------------------------------------------------
 Fri May 24 10:30:24 UTC 2013 - werner@suse.de
 

emacs.spec

@@ -82,6 +82,7 @@ Provides:       nxml-mode = 20041004
 Obsoletes:      nxml-mode < 20041004
 Provides:       epg = 1.0.0
 Obsoletes:      epg < 1.0.0
+Requires(pre):  fileutils
 Source:         ftp://ftp.gnu.org/gnu/emacs/emacs-24.3.tar.xz
 Source1:        app-defaults.Emacs
 Source2:        site-lisp.tar.bz2
@@ -126,7 +127,7 @@ Basic package for the GNU Emacs editor. Requires emacs-x11 or
 emacs-nox.
 
 %package     -n emacs-nox
-PreReq:         fileutils
+Requires(post): fileutils
 Requires:       emacs = %{version}-%{release}
 Provides:       emacs_program = %{version}-%{release}
 Summary:        GNU Emacs-nox: An Emacs Binary without X Window System Support
@@ -140,7 +141,7 @@ emacs-nox
 Love it or leave it.
 
 %package     -n emacs-x11
-PreReq:         fileutils
+Requires(post): fileutils
 Requires:       emacs = %{version}-%{release}
 Provides:       emacs_program = %{version}-%{release}
 Requires:       efont-unicode
@@ -174,7 +175,8 @@ files are pre-byte compiled and therefore not necessary.
 %package     -n emacs-info
 Summary:        Info files for GNU Emacs
 Group:          Productivity/Editors/Emacs
-PreReq:         %install_info_prereq
+Requires(post): %install_info_prereq
+Requires(postun): %install_info_prereq
 %if 0%{?suse_version} >= 1120
 BuildArch:      noarch
 %endif
@@ -188,8 +190,8 @@ modes.
 %package     -n etags
 Summary:        Generate Tag Files for Use with Emacs
 Group:          Development/Tools/Navigators
-PreReq:         %install_info_prereq
-PreReq:         update-alternatives
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 Provides:       ctags:/usr/bin/etags
 
 %description -n etags
@@ -538,14 +540,30 @@ rm -vf %{buildroot}%{_bindir}/gnuctags
 rm -vf %{buildroot}%{_mandir}/man1/gnuctags.1*
 %endif
 
-%post -n emacs-nox
-test -e usr/bin/emacs || ln -sf emacs-nox usr/bin/emacs
-
-%pre -n emacs-x11
+%pre
 test -L usr/bin/emacs && rm -f usr/bin/emacs || true
 
-%postun -n emacs-x11
-test -e usr/bin/emacs-nox -a ! -e usr/bin/emacs && ln -sf emacs-nox usr/bin/emacs || true
+%post -n emacs-nox
+if test -e usr/share/emacs/site-lisp/auctex/font-latex.elc ; then
+  owd=$(pwd)
+  cd usr/share/emacs/site-lisp/auctex || exit 1
+  emacs -batch -no-site-file -no-init-file --eval '(setq load-path (cons "." load-path) 
+    byte-compile-warnings nil
+    TeX-lisp-directory "<none>"
+    TeX-auto-global "<none>")' -f batch-byte-compile font-latex.el > /dev/null 2>&1
+  cd $owd
+fi
+
+%post -n emacs-x11
+if test -e usr/share/emacs/site-lisp/auctex/font-latex.elc ; then
+  owd=$(pwd)
+  cd usr/share/emacs/site-lisp/auctex || exit 1
+  emacs -batch -no-site-file -no-init-file --eval '(setq load-path (cons "." load-path) 
+    byte-compile-warnings nil
+    TeX-lisp-directory "<none>"
+    TeX-auto-global "<none>")' -f batch-byte-compile font-latex.el > /dev/null 2>&1
+  cd $owd
+fi
 
 %post info
 for f in %info_files; do