Merge branch 'f25' into f24
This commit is contained in:
commit
6a092add34
1
.gitignore
vendored
1
.gitignore
vendored
@ -17,3 +17,4 @@
|
|||||||
/emacs-25.0.95.tar.xz
|
/emacs-25.0.95.tar.xz
|
||||||
/emacs-25.1-rc1.tar.xz
|
/emacs-25.1-rc1.tar.xz
|
||||||
/emacs-25.1-rc2.tar.xz
|
/emacs-25.1-rc2.tar.xz
|
||||||
|
/emacs-25.1.tar.xz
|
||||||
|
@ -5,12 +5,11 @@ Summary: GNU Emacs text editor
|
|||||||
Name: emacs
|
Name: emacs
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 25.1
|
Version: 25.1
|
||||||
Release: 0.4.rc2%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv3+ and CC0-1.0
|
License: GPLv3+ and CC0-1.0
|
||||||
URL: http://www.gnu.org/software/emacs/
|
URL: http://www.gnu.org/software/emacs/
|
||||||
Group: Applications/Editors
|
Group: Applications/Editors
|
||||||
#Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz
|
Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz
|
||||||
Source0: ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{version}-rc2.tar.xz
|
|
||||||
Source1: emacs.desktop
|
Source1: emacs.desktop
|
||||||
Source3: dotemacs.el
|
Source3: dotemacs.el
|
||||||
Source4: site-start.el
|
Source4: site-start.el
|
||||||
@ -447,6 +446,9 @@ update-desktop-database &> /dev/null || :
|
|||||||
%dir %{_datadir}/emacs/site-lisp/site-start.d
|
%dir %{_datadir}/emacs/site-lisp/site-start.d
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Sep 19 2016 Jan Synáček <jsynacek@redhat.com> - 1:25.1-1
|
||||||
|
- update to 25.1 (#1377031)
|
||||||
|
|
||||||
* Wed Sep 14 2016 Richard Hughes <rhughes@redhat.com> - 1:25.1-0.4.rc2
|
* Wed Sep 14 2016 Richard Hughes <rhughes@redhat.com> - 1:25.1-0.4.rc2
|
||||||
- Upgrade AppData file to specification 0.6+
|
- Upgrade AppData file to specification 0.6+
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user