rpms/xemacs/devel xemacs.spec,1.33,1.34

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32155

Modified Files:
	xemacs.spec 
Log Message:
* Fri May 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-9
- Require one of the actual editor variants in -common.
- Require -common in -el, drop duplicate dir ownerships.



Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xemacs.spec	24 Jan 2007 16:50:04 -0000	1.33
+++ xemacs.spec	18 May 2007 17:20:37 -0000	1.34
@@ -19,7 +19,7 @@
 
 Name:           xemacs
 Version:        21.5.27
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -81,7 +81,7 @@
 %endif # xft
 # Note: no xemacs-packages-extra dependency here, need main pkg to build it.
 Requires:       xemacs-packages-base >= 20060510
-Requires:       xemacs-common = %{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
 Requires:       xorg-x11-fonts-ISO8859-1-75dpi
 Requires:       xorg-x11-fonts-ISO8859-1-100dpi
 Provides:       xemacs(bin) = %{version}-%{release}
@@ -98,6 +98,7 @@
 %package        common
 Summary:        Byte-compiled lisp files and other common files for XEmacs
 Group:          Applications/Editors
+Requires:       xemacs(bin) = %{version}-%{release}
 Requires(post): %{_sbindir}/alternatives
 Requires(preun): %{_sbindir}/alternatives
 
@@ -115,7 +116,7 @@
 Group:          Applications/Editors
 # Note: no xemacs-packages* dependencies here, we need -nox to build the
 # base package set.
-Requires:       xemacs-common = %{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
 Provides:       xemacs(bin) = %{version}-%{release}
 
 %description    nox
@@ -130,6 +131,7 @@
 %package        el
 Summary:        Emacs lisp source files for XEmacs
 Group:          Development/Libraries
+Requires:       %{name}-common = %{version}-%{release}
 
 %description    el
 XEmacs is a highly customizable open source text editor and
@@ -371,7 +373,7 @@
 
 # combine the file lists
 cat base-*.files dir.files >> base-files
-cat el-*.files dir.files >> el-files
+cat el-*.files >> el-files
 cat info.files >> info-files
 
 
@@ -493,6 +495,10 @@
 
 
 %changelog
+* Fri May 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-9
+- Require one of the actual editor variants in -common.
+- Require -common in -el, drop duplicate dir ownerships.
+
 * Wed Jan 24 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-8
 - Fix canna_api.ell install/load paths (#222559).
 - Fix site-start.el locale setup when the LANG env var is unset.