rpms/emacs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

New upstream version 24.5 (#1210919)

Browse Source 
Signed-off-by: Petr Hracek <phracek@redhat.com>
This commit is contained in:
Petr Hracek 2015-04-14 15:00:23 +02:00
parent da86ace68d
commit 5e82f73ff7
4 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,3 +10,4 @@
/emacs-24.2.tar.xz /emacs-24.2.tar.xz
/emacs-24.3.tar.xz /emacs-24.3.tar.xz
/emacs-24.4.tar.xz /emacs-24.4.tar.xz
/emacs-24.5.tar.xz

28
emacs.spec
View File

@ -4,8 +4,8 @@
Summary: GNU Emacs text editor Summary: GNU Emacs text editor
Name: emacs Name: emacs
Epoch: 1 Epoch: 1
Version: 24.4 Version: 24.5
Release: 6%{?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
@ -20,13 +20,14 @@ Source6: emacs-terminal.desktop
Source7: emacs-terminal.sh Source7: emacs-terminal.sh
Source8: emacs.service Source8: emacs.service
Source9: %{name}.appdata.xml Source9: %{name}.appdata.xml
Source10: %{name}client.appdata.xml
# rhbz#713600 # rhbz#713600
Patch1: emacs-spellchecker.patch Patch1: emacs-spellchecker.patch
# Fix for default PDF viewer bug #971162 # Fix for default PDF viewer bug #971162
Patch2: emacs-pdf-default.patch Patch2: emacs-pdf-default.patch
Patch3: emacs-no-bitmap-icon.patch #Patch3: emacs-no-bitmap-icon.patch
Patch4: emacs-configure.patch #Patch4: emacs-configure.patch
Patch5: emacs-grep-deprecated.patch Patch5: emacs-grep-deprecated.patch
BuildRequires: atk-devel BuildRequires: atk-devel
@ -187,8 +188,8 @@ packages that add functionality to Emacs.
%patch1 -p1 -b .spellchecker %patch1 -p1 -b .spellchecker
%patch2 -p1 -b .pdf-default.patch %patch2 -p1 -b .pdf-default.patch
%patch3 -p1 -b .bitmap #%patch3 -p1 -b .bitmap
%patch4 -p1 -b .config #%patch4 -p1 -b .config
%patch5 -p1 -b .grep-deprecated %patch5 -p1 -b .grep-deprecated
autoconf autoconf
@ -352,17 +353,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
# Merge applications into one software center item # Merge applications into one software center item
mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
cat > $RPM_BUILD_ROOT%{_datadir}/appdata/emacsclient.appdata.xml <<EOF cp -a %SOURCE10 $RPM_BUILD_ROOT%{_datadir}/appdata/emacsclient.appdata.xml
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
<component type="desktop">
<metadata_license>CC0-1.0</metadata_license>
<id>emacsclient.desktop</id>
<metadata>
<value key="X-Merge-With-Parent">emacs.desktop</value>
</metadata>
</component>
EOF
# Byte compile emacs*.py with correct python interpreters # Byte compile emacs*.py with correct python interpreters
%if 0%{?rhel:1} %if 0%{?rhel:1}
@ -491,6 +482,9 @@ update-desktop-database &> /dev/null || :
%dir %{_datadir}/emacs/site-lisp/site-start.d %dir %{_datadir}/emacs/site-lisp/site-start.d
%changelog %changelog
* Tue Apr 14 2015 Petr Hracek <phracek@redhat.com> - 1:24.5-1
- New upstream version 24.5 (#1210919)
* Tue Apr 7 2015 Petr Hracek <phracek@redhat.com> - 1:24.4-6 * Tue Apr 7 2015 Petr Hracek <phracek@redhat.com> - 1:24.4-6
- emacs grep warns 'GREP_OPTIONS is deprecated' (#1176547) - emacs grep warns 'GREP_OPTIONS is deprecated' (#1176547)

9
emacsclient.appdata.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
<component type="desktop">
<metadata_license>CC0-1.0</metadata_license>
<id>emacsclient.desktop</id>
<metadata>
<value key="X-Merge-With-Parent">emacs.desktop</value>
</metadata>
</component>

2
sources
View File

@ -1 +1 @@
ad487658ad7421ad8d7b5152192eb945 emacs-24.4.tar.xz 50560ee00bac9bb9cf0e822764cd0832 emacs-24.5.tar.xz