From 7443f946385ce275cdb46f99b803a36dd0ed334b Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 14 Sep 2016 09:58:52 +0100 Subject: [PATCH 1/3] Upgrade AppData file to specification 0.6+ --- emacs.appdata.xml | 113 +++++++++++++++++++++++++--------------------- emacs.spec | 5 +- 2 files changed, 66 insertions(+), 52 deletions(-) diff --git a/emacs.appdata.xml b/emacs.appdata.xml index 6f98c3b..94ba985 100644 --- a/emacs.appdata.xml +++ b/emacs.appdata.xml @@ -1,53 +1,64 @@ - -emacs.desktop -CC0-1.0 -GPL-3.0+ -Powerful editor -Edit text files, view pictures and binary files - -

-Emacs is a powerful, customizable, self-documenting, modeless -editor. It is used primarely to edit text, including text -documents, source code of programs, web pages and XML documents, -but can also be used to display and edit binary files. -

- -

-Emacs allows efficient editing of text with shortcuts which -allow operating on letters, words, sentences, and paragraphs as -single units. This includes both moving around and operations -like copying, deleting, transposing, and pasting. Macros can be -conveniently defined to repeat sequences of commands. In -addition, Emacs is (partially) built in a scripting language -(elisp) which can also be used to define further functions -extending existing capabilities. -

- -

-Emacs has extensive support for editing source code, including -programmable syntax highlighting, automatic indentation, source -code indexing, overview modes, and navigation based on language -specific units like functions and blocks. It is also possible to -invoke the compiler from within Emacs and easily move between -compiler output and corresponding positions in the source. -

- -

-Emacs has multiple modules which provide further functionality. -This provides the capability to read mail, news, browse -pictures, read man and info pages, browse the web, execute -arbitrary programs, and more, without leaving the editor. -

- - -http://in.waw.pl/~zbyszek/fedora/emacs-two-buffers.png -http://in.waw.pl/~zbyszek/fedora/emacs-editing-xml.png -http://in.waw.pl/~zbyszek/fedora/emacs-hexl-mode.png -http://in.waw.pl/~zbyszek/fedora/emacs-showing-svg.png -http://in.waw.pl/~zbyszek/fedora/emacs-with-python-source.png - -http://www.gnu.org/software/emacs/ -zbyszek@in.waw.pl - + + emacs.desktop + CC0-1.0 + GPL-3.0+ + GNU Emacs + Edit text files, view pictures and binary files + +

+ Emacs is a powerful, customizable, self-documenting, modeless + editor. It is used primarely to edit text, including text + documents, source code of programs, web pages and XML documents, + but can also be used to display and edit binary files. +

+

+ Emacs allows efficient editing of text with shortcuts which + allow operating on letters, words, sentences, and paragraphs as + single units. This includes both moving around and operations + like copying, deleting, transposing, and pasting. Macros can be + conveniently defined to repeat sequences of commands. In + addition, Emacs is (partially) built in a scripting language + (elisp) which can also be used to define further functions + extending existing capabilities. +

+

+ Emacs has extensive support for editing source code, including + programmable syntax highlighting, automatic indentation, source + code indexing, overview modes, and navigation based on language + specific units like functions and blocks. It is also possible to + invoke the compiler from within Emacs and easily move between + compiler output and corresponding positions in the source. +

+

+ Emacs has multiple modules which provide further functionality. + This provides the capability to read mail, news, browse + pictures, read man and info pages, browse the web, execute + arbitrary programs, and more, without leaving the editor. +

+ + + + http://in.waw.pl/~zbyszek/fedora/emacs-two-buffers.png + + + http://in.waw.pl/~zbyszek/fedora/emacs-editing-xml.png + + + http://in.waw.pl/~zbyszek/fedora/emacs-hexl-mode.png + + + http://in.waw.pl/~zbyszek/fedora/emacs-showing-svg.png + + + http://in.waw.pl/~zbyszek/fedora/emacs-with-python-source.png + + + http://www.gnu.org/software/emacs/ + https://www.gnu.org/software/emacs/manual/html_node/emacs/Bugs.html + https://my.fsf.org/donate/ + https://www.gnu.org/software/emacs/manual/ + zbyszek@in.waw.pl + + diff --git a/emacs.spec b/emacs.spec index d2cb28a..723f717 100644 --- a/emacs.spec +++ b/emacs.spec @@ -5,7 +5,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 25.1 -Release: 0.3.rc2%{?dist} +Release: 0.4.rc2%{?dist} License: GPLv3+ and CC0-1.0 URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -447,6 +447,9 @@ update-desktop-database &> /dev/null || : %dir %{_datadir}/emacs/site-lisp/site-start.d %changelog +* Wed Sep 14 2016 Richard Hughes - 1:25.1-0.4.rc2 +- Upgrade AppData file to specification 0.6+ + * Tue Aug 30 2016 Jan Synáček - 1:25.1-0.3.rc2 - update to 25.1 rc2 From 70a5b99c4b06d6393c8a9054de9caba5a6a263b9 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 14 Sep 2016 10:00:32 +0100 Subject: [PATCH 2/3] Upgrade AppData file to specification 0.6+ --- emacs.appdata.xml | 113 +++++++++++++++++++++++++--------------------- emacs.spec | 5 +- 2 files changed, 66 insertions(+), 52 deletions(-) diff --git a/emacs.appdata.xml b/emacs.appdata.xml index 6f98c3b..94ba985 100644 --- a/emacs.appdata.xml +++ b/emacs.appdata.xml @@ -1,53 +1,64 @@ - -emacs.desktop -CC0-1.0 -GPL-3.0+ -Powerful editor -Edit text files, view pictures and binary files - -

-Emacs is a powerful, customizable, self-documenting, modeless -editor. It is used primarely to edit text, including text -documents, source code of programs, web pages and XML documents, -but can also be used to display and edit binary files. -

- -

-Emacs allows efficient editing of text with shortcuts which -allow operating on letters, words, sentences, and paragraphs as -single units. This includes both moving around and operations -like copying, deleting, transposing, and pasting. Macros can be -conveniently defined to repeat sequences of commands. In -addition, Emacs is (partially) built in a scripting language -(elisp) which can also be used to define further functions -extending existing capabilities. -

- -

-Emacs has extensive support for editing source code, including -programmable syntax highlighting, automatic indentation, source -code indexing, overview modes, and navigation based on language -specific units like functions and blocks. It is also possible to -invoke the compiler from within Emacs and easily move between -compiler output and corresponding positions in the source. -

- -

-Emacs has multiple modules which provide further functionality. -This provides the capability to read mail, news, browse -pictures, read man and info pages, browse the web, execute -arbitrary programs, and more, without leaving the editor. -

- - -http://in.waw.pl/~zbyszek/fedora/emacs-two-buffers.png -http://in.waw.pl/~zbyszek/fedora/emacs-editing-xml.png -http://in.waw.pl/~zbyszek/fedora/emacs-hexl-mode.png -http://in.waw.pl/~zbyszek/fedora/emacs-showing-svg.png -http://in.waw.pl/~zbyszek/fedora/emacs-with-python-source.png - -http://www.gnu.org/software/emacs/ -zbyszek@in.waw.pl - + + emacs.desktop + CC0-1.0 + GPL-3.0+ + GNU Emacs + Edit text files, view pictures and binary files + +

+ Emacs is a powerful, customizable, self-documenting, modeless + editor. It is used primarely to edit text, including text + documents, source code of programs, web pages and XML documents, + but can also be used to display and edit binary files. +

+

+ Emacs allows efficient editing of text with shortcuts which + allow operating on letters, words, sentences, and paragraphs as + single units. This includes both moving around and operations + like copying, deleting, transposing, and pasting. Macros can be + conveniently defined to repeat sequences of commands. In + addition, Emacs is (partially) built in a scripting language + (elisp) which can also be used to define further functions + extending existing capabilities. +

+

+ Emacs has extensive support for editing source code, including + programmable syntax highlighting, automatic indentation, source + code indexing, overview modes, and navigation based on language + specific units like functions and blocks. It is also possible to + invoke the compiler from within Emacs and easily move between + compiler output and corresponding positions in the source. +

+

+ Emacs has multiple modules which provide further functionality. + This provides the capability to read mail, news, browse + pictures, read man and info pages, browse the web, execute + arbitrary programs, and more, without leaving the editor. +

+ + + + http://in.waw.pl/~zbyszek/fedora/emacs-two-buffers.png + + + http://in.waw.pl/~zbyszek/fedora/emacs-editing-xml.png + + + http://in.waw.pl/~zbyszek/fedora/emacs-hexl-mode.png + + + http://in.waw.pl/~zbyszek/fedora/emacs-showing-svg.png + + + http://in.waw.pl/~zbyszek/fedora/emacs-with-python-source.png + + + http://www.gnu.org/software/emacs/ + https://www.gnu.org/software/emacs/manual/html_node/emacs/Bugs.html + https://my.fsf.org/donate/ + https://www.gnu.org/software/emacs/manual/ + zbyszek@in.waw.pl + + diff --git a/emacs.spec b/emacs.spec index 997de06..ef07343 100644 --- a/emacs.spec +++ b/emacs.spec @@ -5,7 +5,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 25.1 -Release: 0.2.rc1%{?dist} +Release: 0.3.rc1%{?dist} License: GPLv3+ and CC0-1.0 URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -447,6 +447,9 @@ update-desktop-database &> /dev/null || : %dir %{_datadir}/emacs/site-lisp/site-start.d %changelog +* Wed Sep 14 2016 Richard Hughes - 1:25.1-0.3.rc1 +- Upgrade AppData file to specification 0.6+ + * Mon Jul 25 2016 Jan Synáček - 1:25.1-0.2.rc1 - do not set frame-title-format in default.el (#1359732) From cebd69e08171d244cd037c91a4dd5788db7dc9b8 Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Mon, 19 Sep 2016 10:07:48 +0200 Subject: [PATCH 3/3] update to 25.1 (#1377031) Resolves: #1377031 --- .gitignore | 1 + emacs.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 11d0afe..f579f30 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /emacs-25.0.95.tar.xz /emacs-25.1-rc1.tar.xz /emacs-25.1-rc2.tar.xz +/emacs-25.1.tar.xz diff --git a/emacs.spec b/emacs.spec index 723f717..6dd2a31 100644 --- a/emacs.spec +++ b/emacs.spec @@ -5,12 +5,11 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 25.1 -Release: 0.4.rc2%{?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}-rc2.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 - 1:25.1-1 +- update to 25.1 (#1377031) + * Wed Sep 14 2016 Richard Hughes - 1:25.1-0.4.rc2 - Upgrade AppData file to specification 0.6+ diff --git a/sources b/sources index 2c941a1..09ceb24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6853a2063ce17fce39a84d5516e57d88 emacs-25.1-rc2.tar.xz +4f3d42fb22823a659e16bfa89078a74c emacs-25.1.tar.xz