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

Removed obsoletes: emacs-nxml-mode, fixed license file inclusion

Browse Source
This commit is contained in:
Karel Klíč 2010-07-08 15:00:51 +00:00
parent c094eb1aaf
commit 5d09dcce8c
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
emacs.spec
View File

@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
Name: emacs Name: emacs
Epoch: 1 Epoch: 1
Version: 23.2 Version: 23.2
Release: 5%{?dist} Release: 6%{?dist}
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/emacs/ URL: http://www.gnu.org/software/emacs/
Group: Applications/Editors Group: Applications/Editors
@ -59,9 +59,6 @@ BuildRequires: desktop-file-utils
Requires: desktop-file-utils Requires: desktop-file-utils
Conflicts: gettext < 0.10.40 Conflicts: gettext < 0.10.40
Provides: emacs(bin) = %{epoch}:%{version}-%{release} Provides: emacs(bin) = %{epoch}:%{version}-%{release}
# #516391
Obsoletes: emacs-nxml-mode < 0.20041004-10
Provides: emacs-nxml-mode = 0.20041004-10
# Buildrequire both python2 and python3 since below we turn off the # Buildrequire both python2 and python3 since below we turn off the
# brp-python-bytecompile script # brp-python-bytecompile script
@ -182,7 +179,7 @@ fi
%build %build
export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS" export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS"
#we patch configure.in so we have to do this # We patch configure.in so we have to do this
autoconf autoconf
# Build GTK+2 binary # Build GTK+2 binary
@ -386,13 +383,14 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
%defattr(-,root,root) %defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/skel/.emacs %config(noreplace) %{_sysconfdir}/skel/.emacs
%config(noreplace) %{_sysconfdir}/rpm/macros.emacs %config(noreplace) %{_sysconfdir}/rpm/macros.emacs
%doc etc/NEWS BUGS README %doc etc/NEWS BUGS README etc/COPYING
%exclude %{_bindir}/emacs-* %exclude %{_bindir}/emacs-*
%{_bindir}/* %{_bindir}/*
%{_mandir}/*/* %{_mandir}/*/*
%{_infodir}/* %{_infodir}/*
%dir %{_datadir}/emacs %dir %{_datadir}/emacs
%dir %{_datadir}/emacs/%{version} %dir %{_datadir}/emacs/%{version}
%exclude %{_datadir}/emacs/%{version}/etc/COPYING
%{_datadir}/emacs/%{version}/etc %{_datadir}/emacs/%{version}/etc
%{_datadir}/emacs/%{version}/site-lisp %{_datadir}/emacs/%{version}/site-lisp
%{_libexecdir}/emacs %{_libexecdir}/emacs
@ -402,14 +400,19 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
%files -f el-filelist el %files -f el-filelist el
%defattr(-,root,root) %defattr(-,root,root)
%{pkgconfig}/emacs.pc %{pkgconfig}/emacs.pc
%doc etc/COPYING
%dir %{_datadir}/emacs %dir %{_datadir}/emacs
%dir %{_datadir}/emacs/%{version} %dir %{_datadir}/emacs/%{version}
%changelog %changelog
* Thu Jul 8 2010 Karel Klic <kklic@redhat.com> - 1:23.2-6
- Removed Obsoletes: emacs-nxml-mode, it was obsoleted in F-11
- Added COPYING to emacs-el, moved COPYING in emacs-common to %doc
* Thu Jun 3 2010 Karel Klic <kklic@redhat.com> - 1:23.2-5 * Thu Jun 3 2010 Karel Klic <kklic@redhat.com> - 1:23.2-5
- Fixed handling of dual spacing fonts rhbz#599437 - Fixed handling of dual spacing fonts rhbz#599437
* Thu May 27 2010 Karel Klíč <karel@agata> - 1:23.2-4 * Thu May 27 2010 Karel Klíč <kklic@redhat.com> - 1:23.2-4
- Add patch to fix rhbz#595546 hideshow library matches wrong parenthesis - Add patch to fix rhbz#595546 hideshow library matches wrong parenthesis
under certain circumstances under certain circumstances
- Removed %%clean section - Removed %%clean section