rpms
/
emacs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed %%dir %%{_libexecdir}/emacs and similar from emacs and emacs-nox packages

This commit is contained in:
Karel Klic 2011-05-23 16:25:09 +02:00
parent 87b1c23472
commit 4d43322cc4
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
emacs.spec
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: 4%{?dist} Release: 5%{?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
@ -377,12 +377,8 @@ update-desktop-database &> /dev/null || :
update-desktop-database &> /dev/null || : update-desktop-database &> /dev/null || :
%files %files
%defattr(-,root,root)
%{_bindir}/emacs-%{version} %{_bindir}/emacs-%{version}
%attr(0755,-,-) %ghost %{_bindir}/emacs %attr(0755,-,-) %ghost %{_bindir}/emacs
%dir %{_libexecdir}/emacs
%dir %{_libexecdir}/emacs/%{version}
%dir %{emacs_libexecdir}
%{_datadir}/applications/emacs.desktop %{_datadir}/applications/emacs.desktop
%{_datadir}/applications/emacsclient.desktop %{_datadir}/applications/emacsclient.desktop
%{_datadir}/icons/hicolor/*/apps/emacs.png %{_datadir}/icons/hicolor/*/apps/emacs.png
@ -391,15 +387,10 @@ update-desktop-database &> /dev/null || :
%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document.svg %{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document.svg
%files nox %files nox
%defattr(-,root,root)
%{_bindir}/emacs-%{version}-nox %{_bindir}/emacs-%{version}-nox
%attr(0755,-,-) %ghost %{_bindir}/emacs %attr(0755,-,-) %ghost %{_bindir}/emacs
%dir %{_libexecdir}/emacs
%dir %{_libexecdir}/emacs/%{version}
%dir %{emacs_libexecdir}
%files -f common-filelist common %files -f common-filelist common
%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 etc/COPYING %doc etc/NEWS BUGS README etc/COPYING
@ -417,23 +408,26 @@ update-desktop-database &> /dev/null || :
%attr(0644,root,root) %config %{_datadir}/emacs/site-lisp/site-start.el %attr(0644,root,root) %config %{_datadir}/emacs/site-lisp/site-start.el
%files -f el-filelist el %files -f el-filelist el
%defattr(-,root,root)
%{pkgconfig}/emacs.pc %{pkgconfig}/emacs.pc
%doc etc/COPYING %doc etc/COPYING
%dir %{_datadir}/emacs/%{version} %dir %{_datadir}/emacs/%{version}
%files terminal %files terminal
%defattr(-,root,root)
%{_bindir}/emacs-terminal %{_bindir}/emacs-terminal
%{_datadir}/applications/emacs-terminal.desktop %{_datadir}/applications/emacs-terminal.desktop
%files filesystem %files filesystem
%defattr(-,root,root)
%dir %{_datadir}/emacs %dir %{_datadir}/emacs
%dir %{_datadir}/emacs/site-lisp %dir %{_datadir}/emacs/site-lisp
%dir %{_datadir}/emacs/site-lisp/site-start.d %dir %{_datadir}/emacs/site-lisp/site-start.d
%changelog %changelog
* Mon May 23 2011 Karel Klíč <kklic@redhat.com> - 1:23.3-5
- Removed %%defattr from %%files sections, as RPM no longer needs it
- Removed %%dir %%{_libexecdir}/emacs and similar from emacs and
emacs-nox packages, as the directories are used and present only in
emacs-common (rhbz#704067)
* Tue Mar 22 2011 Karel Klic <kklic@redhat.com> - 1:23.3-4 * Tue Mar 22 2011 Karel Klic <kklic@redhat.com> - 1:23.3-4
- Rebuild to fix an RPM issue (rhbz689182) - Rebuild to fix an RPM issue (rhbz689182)