new upstream version
This commit is contained in:
Daniel Novotny
parent
0068fb7597
commit
fef43a095e
|
|
@ -1 +1 @@
|
|||
emacs-22.3.tar.gz
|
||||
emacs-23.0.93.tar.gz
|
||||
|
|
|
|||
68
emacs.spec
68
emacs.spec
|
|
@ -3,8 +3,8 @@
|
|||
Summary: GNU Emacs text editor
|
||||
Name: emacs
|
||||
Epoch: 1
|
||||
Version: 22.3
|
||||
Release: 11%{?dist}
|
||||
Version: 23.0.93
|
||||
Release: 1%{?dist}
|
||||
License: GPLv3+
|
||||
URL: http://www.gnu.org/software/emacs/
|
||||
Group: Applications/Editors
|
||||
|
|
@ -28,9 +28,9 @@ Patch0: glibc-open-macro.patch
|
|||
Patch1: rpm-spec-mode.patch
|
||||
Patch2: po-mode-auto-replace-date-71264.patch
|
||||
Patch3: rpm-spec-mode-utc.patch
|
||||
Patch4: emacsclient.patch
|
||||
#Patch4: emacsclient.patch
|
||||
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
||||
BuildRequires: atk-devel, cairo-devel, freetype-devel, fontconfig-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
|
||||
BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
|
||||
BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel
|
||||
BuildRequires: libXpm-devel, ncurses-devel, xorg-x11-proto-devel, zlib-devel
|
||||
BuildRequires: autoconf, automake, bzip2, cairo, texinfo
|
||||
|
|
@ -39,7 +39,7 @@ BuildRequires: setarch
|
|||
%endif
|
||||
Requires: xorg-x11-fonts-ISO8859-1-100dpi
|
||||
Requires: emacs-common = %{epoch}:%{version}-%{release}
|
||||
Requires: hicolor-icon-theme
|
||||
#Requires: hicolor-icon-theme
|
||||
Requires: hunspell
|
||||
# Desktop integration
|
||||
BuildRequires: desktop-file-utils
|
||||
|
|
@ -112,7 +112,7 @@ Emacs packages or see some elisp examples.
|
|||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .glibc-open-macro
|
||||
%patch4 -p1
|
||||
#%%patch4 -p1
|
||||
|
||||
# install rest of site-lisp files
|
||||
( cd site-lisp
|
||||
|
|
@ -128,6 +128,9 @@ Emacs packages or see some elisp examples.
|
|||
# we prefer our emacs.desktop file
|
||||
cp %SOURCE1 etc/emacs.desktop
|
||||
|
||||
grep -v "tetris.elc" lisp/Makefile.in > lisp/Makefile.in.new \
|
||||
&& mv lisp/Makefile.in.new lisp/Makefile.in
|
||||
|
||||
# avoid trademark issues
|
||||
%if %{paranoid}
|
||||
rm -f lisp/play/tetris.el lisp/play/tetris.elc
|
||||
|
|
@ -146,7 +149,8 @@ rm -f etc/sex.6 etc/condom.1 etc/celibacy.1 etc/COOKIES etc/future-bug etc/JOKES
|
|||
%build
|
||||
export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS"
|
||||
|
||||
%configure --with-x-toolkit=gtk
|
||||
%configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \
|
||||
--with-tiff --with-xft --with-xpm --with-x-toolkit=gtk
|
||||
|
||||
%__make bootstrap
|
||||
%{setarch} %__make %{?_smp_mflags}
|
||||
|
|
@ -182,7 +186,7 @@ EOF
|
|||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%makeinstall
|
||||
make install INSTALL="%{__install} -p" DESTDIR=%{buildroot}
|
||||
|
||||
# let alternatives manage the symlink
|
||||
rm %{buildroot}%{_bindir}/emacs
|
||||
|
|
@ -194,14 +198,14 @@ rm src/emacs-%{version}.*
|
|||
%__make %{?_smp_mflags}
|
||||
|
||||
# install the emacs without X
|
||||
install -m 0755 src/emacs-%{version}.1 %{buildroot}%{_bindir}/emacs-%{version}-nox
|
||||
install -p -m 0755 src/emacs-%{version}.1 %{buildroot}%{_bindir}/emacs-%{version}-nox
|
||||
|
||||
# make sure movemail isn't setgid
|
||||
chmod 755 %{buildroot}%{emacs_libexecdir}/movemail
|
||||
|
||||
mkdir -p %{buildroot}%{site_lisp}
|
||||
install -m 0644 %SOURCE4 %{buildroot}%{site_lisp}/site-start.el
|
||||
install -m 0644 %SOURCE18 %{buildroot}%{site_lisp}
|
||||
install -p -m 0644 %SOURCE4 %{buildroot}%{site_lisp}/site-start.el
|
||||
install -p -m 0644 %SOURCE18 %{buildroot}%{site_lisp}
|
||||
|
||||
mv %{buildroot}%{_bindir}/{etags,etags.emacs}
|
||||
mv %{buildroot}%{_mandir}/man1/{ctags.1,gctags.1}
|
||||
|
|
@ -209,37 +213,32 @@ mv %{buildroot}%{_mandir}/man1/{etags.1,etags.emacs.1}
|
|||
mv %{buildroot}%{_bindir}/{ctags,gctags}
|
||||
|
||||
# install site-lisp files
|
||||
install -m 0644 site-lisp/*.el{,c} %{buildroot}%{site_lisp}
|
||||
install -p -m 0644 site-lisp/*.el{,c} %{buildroot}%{site_lisp}
|
||||
|
||||
mkdir -p %{buildroot}%{site_lisp}/site-start.d
|
||||
install -m 0644 $RPM_SOURCE_DIR/*-init.el %{buildroot}%{site_lisp}/site-start.d
|
||||
install -p -m 0644 $RPM_SOURCE_DIR/*-init.el %{buildroot}%{site_lisp}/site-start.d
|
||||
|
||||
# default initialization file
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/skel
|
||||
install -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/skel/.emacs
|
||||
install -p -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/skel/.emacs
|
||||
|
||||
# install pkgconfig file
|
||||
mkdir -p %{buildroot}/%{pkgconfig}
|
||||
install -m 0644 emacs.pc %{buildroot}/%{pkgconfig}
|
||||
install -p -m 0644 emacs.pc %{buildroot}/%{pkgconfig}
|
||||
|
||||
# install rpm macro definition file
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/rpm
|
||||
install -m 0644 macros.emacs %{buildroot}%{_sysconfdir}/rpm/
|
||||
install -p -m 0644 macros.emacs %{buildroot}%{_sysconfdir}/rpm/
|
||||
|
||||
# after everything is installed, remove info dir
|
||||
rm -f %{buildroot}%{_infodir}/dir
|
||||
rm %{buildroot}%{_localstatedir}/games/emacs/*
|
||||
|
||||
# install desktop file
|
||||
mkdir -p %{buildroot}%{_datadir}/applications
|
||||
desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
|
||||
%SOURCE1
|
||||
|
||||
# put the icons where they belong
|
||||
for i in 16 24 32 48 ; do
|
||||
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
|
||||
cp %{buildroot}%{_datadir}/emacs/%{version}/etc/images/icons/emacs_${i}.png \
|
||||
%{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/emacs.png
|
||||
done
|
||||
|
||||
#
|
||||
# create file lists
|
||||
|
|
@ -309,14 +308,14 @@ alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-nox 70
|
|||
|
||||
%post common
|
||||
for f in %{info_files}; do
|
||||
/sbin/install-info %{_infodir}/$f.gz %{_infodir}/dir 2> /dev/null || :
|
||||
/sbin/install-info %{_infodir}/$f %{_infodir}/dir 2> /dev/null || :
|
||||
done
|
||||
|
||||
%preun common
|
||||
alternatives --remove emacs.etags %{_bindir}/etags.emacs || :
|
||||
if [ "$1" = 0 ]; then
|
||||
for f in %{info_files}; do
|
||||
/sbin/install-info --delete %{_infodir}/$f.gz %{_infodir}/dir 2> /dev/null || :
|
||||
/sbin/install-info --delete %{_infodir}/$f %{_infodir}/dir 2> /dev/null || :
|
||||
done
|
||||
fi
|
||||
|
||||
|
|
@ -332,6 +331,10 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
|
|||
%dir %{emacs_libexecdir}
|
||||
%{_datadir}/applications/emacs.desktop
|
||||
%{_datadir}/icons/hicolor/*/apps/emacs.png
|
||||
%{_datadir}/icons/hicolor/*/apps/emacs22.png
|
||||
%{_datadir}/icons/hicolor/scalable/apps/emacs.svg
|
||||
%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document.svg
|
||||
|
||||
|
||||
%files nox
|
||||
%defattr(-,root,root)
|
||||
|
|
@ -364,6 +367,9 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
|
|||
%dir %{_datadir}/emacs/%{version}
|
||||
|
||||
%changelog
|
||||
* Mon May 18 2009 Daniel Novotny <dnovotny@redhat.com> 1:23.0.93-1
|
||||
- new upstream version
|
||||
|
||||
* Fri Apr 10 2009 Daniel Novotny <dnovotny@redhat.com> 1:22.3-11
|
||||
- fix bz#443549 - spell-buffer, flyspell-mode do not work
|
||||
|
||||
|
|
@ -625,7 +631,7 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
|
|||
emacs-21-personality-linux32-101818.patch from cvs (Jan Djärv)
|
||||
which also turns off address randomization during dumping (Masatake Yamato)
|
||||
- no longer need to pass SETARCH to make on i386 (#160814)
|
||||
- move ownership of %{_datadir}/emacs/ and %{_datadir}/emacs/%{version}/
|
||||
- move ownership of %%{_datadir}/emacs/ and %%{_datadir}/emacs/%{version}/
|
||||
from emacs to emacs-el and emacs-leim subpackages
|
||||
- don't build tramp html and dvi documentation
|
||||
- drop src/config.in part of bzero-and-have-stdlib.dpatch to avoid
|
||||
|
|
@ -665,12 +671,12 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
|
|||
* Sun Apr 10 2005 Jens Petersen <petersen@redhat.com> - 21.4-1
|
||||
- update to 21.4 movemail vulnerability release
|
||||
- no longer need movemail-CAN-2005-0100.patch
|
||||
- replace %{_bindir}/emacs alternatives with a wrapper script (Warren Togami)
|
||||
- replace %%{_bindir}/emacs alternatives with a wrapper script (Warren Togami)
|
||||
to prevent it from disappearing when upgrading (Michal Jaegermann, 154326)
|
||||
- suffix the X emacs binaries with -x and the no X binaries with -nox
|
||||
- the wrapper script %{_bindir}/emacs-%%version runs emacs-x if installed or
|
||||
otherwise emacs-nox. %{_bindir}/emacs is a symlink to the wrapper
|
||||
- make emacs and emacs-nox own the subdirs in %{_libexecdir}
|
||||
- the wrapper script %%{_bindir}/emacs-%%version runs emacs-x if installed or
|
||||
otherwise emacs-nox. %%{_bindir}/emacs is a symlink to the wrapper
|
||||
- make emacs and emacs-nox own the subdirs in %%{_libexecdir}
|
||||
- add a bunch of fixes from debian's emacs21_21.4a-1 patch:
|
||||
battery-acpi-support.dpatch, bzero-and-have-stdlib.dpatch,
|
||||
coding-region-leak.dpatch, detect-coding-iso2022.dpatch,
|
||||
|
|
@ -719,7 +725,7 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
|
|||
- add emacs-21.3-latex-mode-hook-144083.patch
|
||||
|
||||
* Fri Feb 18 2005 Jens Petersen <petersen@redhat.com> - 21.3-23
|
||||
- install %{_bindir}/emacs-nox as a hardlink of the versioned binary
|
||||
- install %%{_bindir}/emacs-nox as a hardlink of the versioned binary
|
||||
- drop explicit lib requirements
|
||||
- use sed instead of perl to fix up filelists
|
||||
|
||||
|
|
@ -1351,7 +1357,7 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
|
|||
on emacs
|
||||
|
||||
* Thu Apr 15 1999 Bill Nottingham <notting@redhat.com>
|
||||
- make sure movemail doesn't get %defattr()'d to root.root
|
||||
- make sure movemail doesn't get %%defattr()'d to root.root
|
||||
|
||||
* Wed Apr 14 1999 Cristian Gafton <gafton@redhat.com>
|
||||
- patch to make it work with dxpc
|
||||
|
|
|
|||
Loading…
Reference in New Issue