Keep COPYING and NEWS in the etc subdir, and symlinks in the docs (rhbz#714212)

This commit is contained in:
Karel Klic 2011-09-27 12:02:08 +02:00
parent 1a9e60f06c
commit 3e282839a6

View File

@ -3,7 +3,7 @@ Summary: GNU Emacs text editor
Name: emacs Name: emacs
Epoch: 1 Epoch: 1
Version: 23.3 Version: 23.3
Release: 9%{?dist} Release: 10%{?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
@ -188,6 +188,10 @@ fi
%define setarch %{nil} %define setarch %{nil}
%endif %endif
# Avoid duplicating doc files in the common subpackage
ln -s ../../%{name}/%{version}/etc/COPYING doc
ln -s ../../%{name}/%{version}/etc/NEWS doc
%build %build
export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS" export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS"
@ -395,7 +399,7 @@ update-desktop-database &> /dev/null || :
%files -f common-filelist common %files -f common-filelist common
%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 etc/COPYING %doc doc/NEWS BUGS README doc/COPYING
%{_bindir}/b2m %{_bindir}/b2m
%{_bindir}/ebrowse %{_bindir}/ebrowse
%{_bindir}/emacsclient %{_bindir}/emacsclient
@ -406,7 +410,6 @@ update-desktop-database &> /dev/null || :
%{_mandir}/*/* %{_mandir}/*/*
%{_infodir}/* %{_infodir}/*
%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
@ -428,6 +431,10 @@ update-desktop-database &> /dev/null || :
%dir %{_datadir}/emacs/site-lisp/site-start.d %dir %{_datadir}/emacs/site-lisp/site-start.d
%changelog %changelog
* Tue Sep 27 2011 Karel Klíč <kklic@redhat.com> - 1:23.3-10
- Keep COPYING and NEWS in the etc subdir, and symlinks in the docs (rhbz#714212)
Author: fedora.dm0@gmail.com
* Tue Sep 27 2011 Karel Klíč <kklic@redhat.com> - 1:23.3-9 * Tue Sep 27 2011 Karel Klíč <kklic@redhat.com> - 1:23.3-9
- Added dependency on xorg-x11-fonts-misc (rhbz#732422) - Added dependency on xorg-x11-fonts-misc (rhbz#732422)