Merge branch 'master' into f25

This commit is contained in:
Jan Synacek 2016-09-19 12:15:10 +02:00
commit a25652176b
3 changed files with 8 additions and 4 deletions

2
.gitignore vendored
View File

@ -16,3 +16,5 @@
/emacs-25.0.94.tar.xz
/emacs-25.0.95.tar.xz
/emacs-25.1-rc1.tar.xz
/emacs-25.1-rc2.tar.xz
/emacs-25.1.tar.xz

View File

@ -5,12 +5,11 @@ Summary: GNU Emacs text editor
Name: emacs
Epoch: 1
Version: 25.1
Release: 0.3.rc1%{?dist}
Release: 1%{?dist}
License: GPLv3+ and CC0-1.0
URL: http://www.gnu.org/software/emacs/
Group: Applications/Editors
#Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz
Source0: ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{version}-rc1.tar.xz
Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz
Source1: emacs.desktop
Source3: dotemacs.el
Source4: site-start.el
@ -447,6 +446,9 @@ update-desktop-database &> /dev/null || :
%dir %{_datadir}/emacs/site-lisp/site-start.d
%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.3.rc1
- Upgrade AppData file to specification 0.6+

View File

@ -1 +1 @@
a99157273140cba953fbd6bec232360f emacs-25.1-rc1.tar.xz
4f3d42fb22823a659e16bfa89078a74c emacs-25.1.tar.xz