SPECS: xemacs.spec - rel 3; pl app-defaults also fixed

[arekm]

Author: arekm                        Date: Mon Jan  1 13:28:48 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 3; pl app-defaults also fixed

---- Files affected:
SPECS:
   xemacs.spec (1.154 -> 1.155) 

---- Diffs:

================================================================
Index: SPECS/xemacs.spec
diff -u SPECS/xemacs.spec:1.154 SPECS/xemacs.spec:1.155
--- SPECS/xemacs.spec:1.154	Mon Jan  1 13:46:13 2007
+++ SPECS/xemacs.spec	Mon Jan  1 14:28:42 2007
@@ -18,7 +18,7 @@
 Summary(uk):	÷ĹŇÓŚŃ GNU Emacs ÄĚŃ X Window System
 Name:		xemacs
 Version:	%{ver}.%{sver}
-Release:	2
+Release:	3
 License:	GPL
 Group:		Applications/Editors/Emacs
 Source0:	http://ftp.xemacs.org/xemacs/xemacs-%{ver}/%{name}-%{version}.tar.gz
@@ -62,7 +62,6 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_ulibdir	/usr/lib
-%define		_appdefsdir	%{_datadir}/X11/app-defaults
 
 %description
 XEmacs is a highly customizable open source text editor and
@@ -315,7 +314,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/var/lock/xemacs} \
-	$RPM_BUILD_ROOT{%{_mandir}/{ja/man1,man1},%{_appdefsdir}/pl} \
+	$RPM_BUILD_ROOT{%{_mandir}/{ja/man1,man1},%{_datadir}/X11/{pl,}/app-defaults} \
 	$RPM_BUILD_ROOT%{_datadir}/%{name}/lisp \
 	$RPM_BUILD_ROOT%{_ulibdir}/%{name} \
 	$RPM_BUILD_ROOT%{_datadir}/%{name}-packages/{etc,lib-src}
@@ -343,10 +342,10 @@
 ln -s %{_datadir}/%{name}/site-lisp $RPM_BUILD_ROOT%{_ulibdir}/%{name}/site-lisp
 
 install $RPM_BUILD_ROOT%{_datadir}/%{name}-%{xver}%{_sysconfdir}/Emacs.ad \
-	$RPM_BUILD_ROOT%{_appdefsdir}/Emacs
+	$RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/Emacs
 install $RPM_BUILD_ROOT%{_datadir}/%{name}-%{xver}%{_sysconfdir}/Emacs.ad \
-	$RPM_BUILD_ROOT%{_appdefsdir}/pl/Emacs
-cat %{SOURCE4} >>$RPM_BUILD_ROOT%{_appdefsdir}/pl/Emacs
+	$RPM_BUILD_ROOT%{_datadir}/X11/pl/app-defaults/Emacs
+cat %{SOURCE4} >>$RPM_BUILD_ROOT%{_datadir}/X11/pl/app-defaults/Emacs
 
 #mv $RPM_BUILD_ROOT%{_datadir}/%{name}-%{xver}%{_sysconfdir}/xemacs-ja.1 \
 #	$RPM_BUILD_ROOT%{_mandir}/ja/man1/xemacs.1
@@ -409,8 +408,8 @@
 %{_datadir}/%{name}-%{xver}/etc/*.png
 %{_datadir}/%{name}-%{xver}/etc/*.xbm
 %{_datadir}/%{name}-%{xver}/etc/*.xpm
-%{_appdefsdir}/Emacs
-%lang(pl) %{_appdefsdir}/pl/Emacs
+%{_datadir}/X11/app-defaults/Emacs
+%lang(pl) %{_datadir}/X11/pl/app-defaults/Emacs
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/*
 %{_mandir}/man1/gnuattach.1*
@@ -487,6 +486,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.155  2007/01/01 13:28:42  arekm
+- rel 3; pl app-defaults also fixed
+
 Revision 1.154  2007/01/01 12:46:13  arekm
 - fix app-defaults dir
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xemacs.spec?r1=1.154&r2=1.155&f=u