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

Merge branch 'master' into f17

Browse Source
This commit is contained in:
Karel Klic 2012-06-08 16:41:00 +02:00
commit b9a3b97420
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
/emacs-24.0.94.tar.gz
/emacs-24.0.95.tar.gz
/emacs-24.0.97.tar.gz
/emacs-24.1-rc.tar.gz

38
emacs.spec
View File

@ -2,13 +2,13 @@
Summary: GNU Emacs text editor
Name: emacs
Epoch: 1
Version: 24.0.97
Release: 1%{?dist}
Version: 24.1
Release: 0.rc1%{?dist}
License: GPLv3+
URL: http://www.gnu.org/software/emacs/
Group: Applications/Editors
#Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.bz2
Source0: http://alpha.gnu.org/gnu/emacs/pretest/emacs-%{version}.tar.gz
Source0: http://alpha.gnu.org/gnu/emacs/pretest/emacs-24.1-rc.tar.gz
Source1: emacs.desktop
Source2: emacsclient.desktop
Source3: dotemacs.el
@ -434,6 +434,10 @@ update-desktop-database &> /dev/null || :
%dir %{_datadir}/emacs/site-lisp/site-start.d
%changelog
* Fri Jun 8 2012 Karel Klíč <kklic@redhat.com> - 1:24.1-0.rc1
- New upstream prerelease
- Cleanup of the %%changelog section
* Mon May 21 2012 Karel Klíč <kklic@redhat.com> - 1:24.0.97-1
- Newest prerelease
@ -740,7 +744,7 @@ update-desktop-database &> /dev/null || :
* Thu Jun 25 2009 Daniel Novotny <dnovotny@redhat.com> 1:23.0.93-5
- revoked default.el change (#508033)
- added build dependency: librsvg2-devel (#507852)
- added dependency: aspell (#443549)
- added dependency: aspell (#443549)
* Wed Jun 24 2009 Daniel Novotny <dnovotny@redhat.com> 1:23.0.93-4
- added xorg-x11-fonts-misc to dependencies (#469220)
@ -864,7 +868,7 @@ update-desktop-database &> /dev/null || :
* Mon Aug 13 2007 Chip Coldwell <coldwell@redhat.com> - 22.1-2
- add pkgconfig file for emacs-common and virtual provides (Resolves: bz242176)
- glibc-open-macro.patch to deal with glibc turning "open" into a macro.
- leave emacs info pages in default section (Resolves: bz199008)
- leave emacs info pages in default section (Resolves: bz199008)
* Fri Jun 6 2007 Chip Coldwell <coldwell@redhat.com> - 22.1-1
- move alternatives install to posttrans scriptlet (Resolves: bz239745)
@ -1468,8 +1472,8 @@ update-desktop-database &> /dev/null || :
- Drop all old patches
- Misc cleanups
- Update the elisp manual to 21-2.7
- Deprecate the emacs-nox and emacs-X11 subpackages.
Simplify build procedure to match.
- Deprecate the emacs-nox and emacs-X11 subpackages.
Simplify build procedure to match.
- Update php-mode to 1.0.0
* Mon Oct 15 2001 Trond Eivind Glomsrød <teg@redhat.com> 20.7-43
@ -1534,7 +1538,7 @@ update-desktop-database &> /dev/null || :
* Mon Dec 18 2000 Trond Eivind Glomsrød <teg@redhat.com>
- add /usr/share/emacs/locale.alias , which had gone AWOL
- update rpm-spec-mode to 0.11a, fresh from the author
(Stig Bjorlykke <stigb@tihlde.org>). The changes we made
(Stig Bjorlykke <stigb@tihlde.org>). The changes we made
are integrated.
* Fri Dec 15 2000 Trond Eivind Glomsrød <teg@redhat.com>
@ -1551,10 +1555,10 @@ update-desktop-database &> /dev/null || :
* Thu Dec 07 2000 Trond Eivind Glomsrød <teg@redhat.com>
- add rpm-spec-mode after modifying (use Red Hat groups,
from /usr/share/doc/rpm-version/GROUPS) and fixing
colours(don't specify "yellow" on "bright") Also,
colours(don't specify "yellow" on "bright") Also,
use gpg, not pgp.
- use it (site-start.el)
- add mwheel
- add mwheel
- use it, in /etc/skel/.emacs
* Thu Nov 30 2000 Trond Eivind Glomsrød <teg@redhat.com>
@ -1562,7 +1566,7 @@ update-desktop-database &> /dev/null || :
- change site-start.el so files in the above directory
are automatically run on startup
- don't set the ispell name in site-start.el, use the
above directory instead
above directory instead
* Thu Oct 19 2000 Trond Eivind Glomsrød <teg@redhat.com>
- fix icon name in the .desktop file
@ -1588,7 +1592,7 @@ update-desktop-database &> /dev/null || :
- don't use bcopy without a prototype
* Thu Aug 24 2000 Trond Eivind Glomsrød <teg@redhat.com>
- define MAIL_USE_LOCKF
- define MAIL_USE_LOCKF
- remove setgid on movemail
* Mon Aug 07 2000 Trond Eivind Glomsrød <teg@redhat.com>
@ -1614,7 +1618,7 @@ update-desktop-database &> /dev/null || :
* Wed Jun 28 2000 Trond Eivind Glomsrød <teg@redhat.com>
- include python mode and change in site-start.el related to this
- some changes to the default .emacs
- some changes to the default .emacs
* Mon Jun 26 2000 Matt Wilson <msw@redhat.com>
- don't build with -O2 on alpha until we can track down the compiler
@ -1631,7 +1635,7 @@ update-desktop-database &> /dev/null || :
* Wed Jun 14 2000 Matt Wilson <msw@redhat.com>
- edited japanese patch not to patch configure
- fixed a missing escaped " in a wc string
- fixed a missing escaped \" in a wc string
- merge japanese support to head of development
* Tue Jun 13 2000 Trond Eivind Glomsrød <teg@redhat.com>
@ -1676,11 +1680,11 @@ update-desktop-database &> /dev/null || :
- gzip man pages
* Thu Apr 20 2000 Trond Eivind Glomsrød <teg@redhat.com>
- added a security patch from RUS-CERT, which fixes
- added a security patch from RUS-CERT, which fixes
bugs mentioned in "Advisory 200004-01: GNU Emacs 20"
* Tue Apr 18 2000 Trond Eivind Glomsrød <teg@redhat.com>
- patched to detect bash2 scripts.
- patched to detect bash2 scripts.
* Thu Apr 06 2000 Trond Eivind Glomsrød <teg@redhat.com>
- removed configuraton file status from /usr/share/pixmaps/emacs.png
@ -1750,7 +1754,7 @@ update-desktop-database &> /dev/null || :
* Wed Mar 31 1999 Preston Brown <pbrown@redhat.com>
- updated mh-utils emacs lisp file to match our nmh path locations
* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
- auto rebuild in the new build environment (release 9)
* Fri Feb 26 1999 Cristian Gafton <gafton@redhat.com>

2
sources
View File

@ -1,2 +1,2 @@
b4786719f5669a238a836da187ed0115 emacs-24.0.97.tar.gz
07c36f4e3fa3394ae5a6b513800bc976 emacs-24.1-rc.tar.gz
d9a1e06bb579950c58fd3c1d8e813ce6 php-mode.el