- Changed /usr/X11R6/share/pixmaps to %{_pixmapsdir}

Changed files:
    emacs.spec -> 1.46

diff --git a/emacs.spec b/emacs.spec
index a6cdcd48e154a8b64bb82ee0f838e567967c5332..935c60195a9bdce5530b0abe86a0d5e9a57f4b85 100644 (file)
--- a/emacs.spec
+++ b/emacs.spec
@@ -346,8 +346,7 @@ cd ..
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT{%{_infodir},%{_libdir}/emacs/site-lisp} \
-       $RPM_BUILD_ROOT{%{_applnkdir}/Editors,/etc/skel} \
-       $RPM_BUILD_ROOT/usr/X11R6/share/pixmaps
+       $RPM_BUILD_ROOT{%{_applnkdir}/Editors,/etc/skel,%{_pixmapsdir}} \
 
 %{makeinstall} -C build-withx
 install build-nox/src/emacs    $RPM_BUILD_ROOT%{_bindir}/emacs-nox
@@ -355,7 +354,7 @@ install build-nox/src/emacs $RPM_BUILD_ROOT%{_bindir}/emacs-nox
 install %{SOURCE3} $RPM_BUILD_ROOT%{_applnkdir}/Editors
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/skel/.emacs
 install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.el
-install %{SOURCE6} $RPM_BUILD_ROOT/usr/X11R6/share/pixmaps
+install %{SOURCE6} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 install build-nox/etc/DOC-* $RPM_BUILD_ROOT%{_datadir}/emacs/%{version}/etc
 
@@ -398,13 +397,13 @@ fi
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/emacs
-%{_applnkdir}/Editors/emacs.desktop
-/usr/X11R6/share/pixmaps/*
 %{_datadir}/emacs/%{version}/lisp/*.xpm
 %{_datadir}/emacs/%{version}/lisp/gnus/*.xpm
 %dir %{_datadir}/emacs/%{version}/lisp/toolbar
 %{_datadir}/emacs/%{version}/lisp/toolbar/*.elc
 %{_datadir}/emacs/%{version}/lisp/toolbar/*.xpm
+%{_applnkdir}/Editors/emacs.desktop
+%{_pixmapsdir}/*
 
 %files common
 %defattr(644,root,root,755)