Attachment 948795 Details for Bug 1151652 – Patch to merge the packages

[patch] Patch to merge the packages

rhbz1151652.patch (text/plain), 2.19 KB, created by Sergio Durigan Junior on 2014-10-21 05:10:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergio Durigan Junior

Created: 2014-10-21 05:10:15 UTC

Size: 2.19 KB

patch

obsolete

>diff --git a/emacs.spec b/emacs.spec
>index e4ae126..d9336e2 100644
>--- a/emacs.spec
>+++ b/emacs.spec
>@@ -3,7 +3,7 @@ Summary: GNU Emacs text editor
> Name: emacs
> Epoch: 1
> Version: 24.3
>-Release: 25%{?dist}
>+Release: 26%{?dist}
> License: GPLv3+
> URL: http://www.gnu.org/software/emacs/
> Group: Applications/Editors
>@@ -141,19 +141,6 @@ without leaving the editor.
> 
> This package contains all the common files needed by emacs or emacs-nox.
> 
>-%package el
>-Summary: Lisp source files included with GNU Emacs
>-Group: Applications/Editors
>-Requires: %{name}-filesystem
>-BuildArch: noarch
>-
>-%description el
>-Emacs-el contains the emacs-elisp sources for many of the elisp
>-programs included with the main Emacs text editor package.
>-
>-You need to install emacs-el only if you intend to modify any of the
>-Emacs packages or see some elisp examples.
>-
> %package terminal
> Summary: A desktop menu item for GNU Emacs terminal.
> Group: Applications/Editors
>@@ -450,10 +437,10 @@ update-desktop-database &> /dev/null || :
> %attr(0755,-,-) %ghost %{_bindir}/emacs
> %attr(0755,-,-) %ghost %{_bindir}/emacs-nox
> 
>-%files -f common-filelist common
>+%files common -f common-filelist -f el-filelist
> %config(noreplace) %{_sysconfdir}/skel/.emacs
> %{_rpmconfigdir}/macros.d/macros.emacs
>-%doc doc/NEWS BUGS README doc/COPYING
>+%doc doc/NEWS BUGS README doc/COPYING etc/COPYING
> %{_bindir}/ebrowse
> %{_bindir}/emacsclient
> %{_bindir}/etags.emacs
>@@ -469,11 +456,7 @@ update-desktop-database &> /dev/null || :
> %{_userunitdir}/emacs.service
> %attr(0644,root,root) %config(noreplace) %{_datadir}/emacs/site-lisp/default.el
> %attr(0644,root,root) %config %{_datadir}/emacs/site-lisp/site-start.el
>-
>-%files -f el-filelist el
> %{pkgconfig}/emacs.pc
>-%doc etc/COPYING
>-%dir %{_datadir}/emacs/%{version}
> 
> %files terminal
> %{_bindir}/emacs-terminal
>@@ -485,6 +468,10 @@ update-desktop-database &> /dev/null || :
> %dir %{_datadir}/emacs/site-lisp/site-start.d
> 
> %changelog
>+* Tue Oct 21 2014 Sergio Durigan Junior <sergiodj@sergiodj.net> - 1:24.3-26
>+- resolves: #1151652
>+  Merge emacs-el into emacs-common
>+
> * Tue Sep 30 2014 jchaloup <jchaloup@redhat.com> - 1:24.3-25
> - resolves: #1147912
>   Service dont start. Must be replace: "Type=Forking" > "Type=forking".

Actions: View | Diff

Attachments on bug 1151652: 948795