Accepting request 112470 from editors

- Remove obsolete Obsoletes and Provides tags

- Correct License tag that is that emacs is now GPLv3 or later (bnc#755524)

- add %dir /usr/share/X11/app-defaults to fix factory build.

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

emacs.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Apr  4 13:00:31 UTC 2012 - werner@suse.de
+
+- Remove obsolete Obsoletes and Provides tags
+
+-------------------------------------------------------------------
+Wed Apr  4 07:03:43 UTC 2012 - werner@suse.de
+
+- Correct License tag that is that emacs is now GPLv3 or later (bnc#755524)
+
+-------------------------------------------------------------------
+Wed Mar 14 10:31:33 CET 2012 - meissner@suse.de
+
+- add %dir /usr/share/X11/app-defaults to fix factory build.
+
 -------------------------------------------------------------------
 Tue Jan 10 14:53:41 UTC 2012 - werner@suse.de
 

emacs.spec

@@ -15,6 +15,8 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
+
 Name:           emacs
 BuildRequires:  alsa-devel
 BuildRequires:  autoconf
@@ -49,13 +51,11 @@ BuildRequires:  gpm
 Url:            http://www.gnu.org/software/emacs/
 Version:        23.3
 Release:        0
-Obsoletes:      ge_exec ge_site emacmisc emacsger emacs-url Mule-UCS emacs-calc erc
+Requires:       ctags
 Requires:       emacs-info = %{version}
 Requires:       emacs_program = %{version}-%{release}
-Requires:       ctags
-Provides:       ge_site ge_exec emacs-url Mule-UCS emacs-calc erc emacmisc
 Summary:        GNU Emacs Base Package
-License:        GPL-2.0+
+License:        GPL-3.0+
 Group:          Productivity/Editors/Emacs
 Source:         ftp://ftp.gnu.org/gnu/emacs/emacs-23.3b.tar.bz2
 Source1:        app-defaults.Emacs
@@ -90,13 +90,15 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define _x11data    %{_exec_prefix}/lib/X11
 %define _libx11     %{_x11data}
 %define _x11inc     %{_exec_prefix}/include
-%define appDefaultsFile %{_x11data}/app-defaults/Emacs
+%define appDefaultsDir %{_x11data}/app-defaults
+%define appDefaultsFile %{appDefaultsDir}/Emacs
 %else
 %define _x11lib     %{_libdir}
 %define _x11data    %{_datadir}/X11
 %define _libx11     %{_exec_prefix}/lib/X11
 %define _x11inc     %{_includedir}
-%define appDefaultsFile %{_x11data}/app-defaults/Emacs
+%define appDefaultsDir %{_x11data}/app-defaults
+%define appDefaultsFile %{appDefaultsDir}/Emacs
 %endif
 %define info_files  elisp emacs eintr ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse ede ediff edt eieio emacs-mime epa erc eshell eudc efaq flymake forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc remember reftex sasl sc semantic ses sieve smtpmail speedbar tramp url vip viper widget woman
 
@@ -106,9 +108,8 @@ emacs-nox.
 
 %package     -n emacs-nox
 PreReq:         fileutils
-Obsoletes:      emac_nox
 Requires:       emacs = %{version}-%{release}
-Provides:       emacs_program = %{version}-%{release}, emac_nox
+Provides:       emacs_program = %{version}-%{release}
 Summary:        GNU Emacs-nox: An Emacs Binary without X Window System Support
 Group:          Productivity/Editors/Emacs
 
@@ -121,11 +122,9 @@ Love it or leave it.
 
 %package     -n emacs-x11
 PreReq:         fileutils
-Obsoletes:      emacsbin
 Requires:       emacs = %{version}-%{release}
+Provides:       emacs_program = %{version}-%{release}
 Enhances:       xorg-x11-libs
-Provides:       emacs_program = %{version}-%{release} emacsbin
-Provides:       emacs:/usr/bin/emacs ge_exec:/usr/bin/emacs
 Summary:        GNU Emacs: Emacs binary with X Window System Support
 Group:          Productivity/Editors/Emacs
 
@@ -138,9 +137,7 @@ Love it or leave it. This is the Emacs binary with X Window System
 Support.
 
 %package     -n emacs-el
-Obsoletes:      ge_lisp
 Requires:       emacs = %{version}-%{release}
-Provides:       ge_lisp
 Summary:        Several Lisp Files for GNU Emacs
 Group:          Productivity/Editors/Emacs
 %if 0%{?suse_version} >= 1120
@@ -152,8 +149,6 @@ Several Lisp files not needed for running GNU Emacs. Most of these
 files are pre-byte compiled and therefore not necessary.
 
 %package     -n emacs-info
-Obsoletes:      ge_info elispman elisp-manual elispint emacs-lisp-intro
-Provides:       elispman elisp-manual elispint emacs-lisp-intro ge_info
 Summary:        Info files for GNU Emacs
 Group:          Productivity/Editors/Emacs
 PreReq:         %install_info_prereq
@@ -2889,6 +2884,7 @@ done
 %defattr(-, root, root)
 %{_bindir}/emacs-x11
 %{_bindir}/emacs-gtk
+%dir %{appDefaultsDir}
 %{appDefaultsFile}
 %{_datadir}/applications/emacs.desktop
 %{_datadir}/pixmaps/emacs.png