Hello community, here is the log from the commit of package emacs for openSUSE:Factory checked in at 2012-04-12 09:21:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emacs (Old) and /work/SRC/openSUSE:Factory/.emacs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "emacs", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/emacs/emacs.changes 2012-02-10 17:13:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs.changes 2012-04-12 09:21:32.000000000 +0200 @@ -1,0 +2,15 @@ +Wed Apr 4 13:00:31 UTC 2012 - [email protected] + +- Remove obsolete Obsoletes and Provides tags + +------------------------------------------------------------------- +Wed Apr 4 07:03:43 UTC 2012 - [email protected] + +- Correct License tag that is that emacs is now GPLv3 or later (bnc#755524) + +------------------------------------------------------------------- +Wed Mar 14 10:31:33 CET 2012 - [email protected] + +- add %dir /usr/share/X11/app-defaults to fix factory build. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.spec ++++++ --- /var/tmp/diff_new_pack.boXUOK/_old 2012-04-12 09:21:34.000000000 +0200 +++ /var/tmp/diff_new_pack.boXUOK/_new 2012-04-12 09:21:34.000000000 +0200 @@ -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 @@ 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 @@ %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 @@ %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 @@ %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 @@ 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 @@ 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 @@ %defattr(-, root, root) %{_bindir}/emacs-x11 %{_bindir}/emacs-gtk +%dir %{appDefaultsDir} %{appDefaultsFile} %{_datadir}/applications/emacs.desktop %{_datadir}/pixmaps/emacs.png -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
