rpms/xemacs/devel xemacs-sitestart.el, 1.3, 1.4 xemacs.spec, 1.27, 1.28

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	xemacs-sitestart.el xemacs.spec 
Log Message:
* Sun Sep 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-3
- Adjust to split xemacs-packages-{base,extra}.
- Provide xemacs(bin) in main package and -nox.



Index: xemacs-sitestart.el
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs-sitestart.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xemacs-sitestart.el	6 Apr 2006 16:27:53 -0000	1.3
+++ xemacs-sitestart.el	10 Sep 2006 09:45:06 -0000	1.4
@@ -125,7 +125,7 @@
         (define-coding-system-alias 'native tmp)))
 
     ;; Register available Input Methods.
-    (load "leim-list")
+    (load "leim-list" t)
     (when (member lang '("ja" "ko" "zh"))
       ;; ispell doesn't support CJK
       (setq-default ispell-local-dictionary "english"))))


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xemacs.spec	2 Sep 2006 20:31:25 -0000	1.27
+++ xemacs.spec	10 Sep 2006 09:45:06 -0000	1.28
@@ -19,7 +19,7 @@
 
 Name:           xemacs
 Version:        21.5.27
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -77,10 +77,12 @@
 %if %{with xft}
 BuildRequires:  libXft-devel
 %endif # xft
-Requires:       xemacs-sumo >= 20050118-2
+# Note: no xemacs-packages-extra dependency here, need main pkg to build it.
+Requires:       xemacs-packages-base >= 20060510
 Requires:       xemacs-common = %{version}-%{release}
 Requires:       xorg-x11-fonts-ISO8859-1-75dpi
 Requires:       xorg-x11-fonts-ISO8859-1-100dpi
+Provides:       xemacs(bin) = %{version}-%{release}
 
 %description
 XEmacs is a highly customizable open source text editor and
@@ -109,8 +111,10 @@
 %package        nox
 Summary:        Different version of Emacs built without X Windows support
 Group:          Applications/Editors
-# Note: no xemacs-sumo dependency here, we need -nox to build the sumo package.
+# Note: no xemacs-packages* dependencies here, we need -nox to build the
+# base package set.
 Requires:       xemacs-common = %{version}-%{release}
+Provides:       xemacs(bin) = %{version}-%{release}
 
 %description    nox
 XEmacs is a highly customizable open source text editor and
@@ -204,7 +208,6 @@
 
 common_options="
     --with-system-packages=%{_datadir}/xemacs
-    --with-gpm
     --with-pop
     --with-mail-locking=lockf
     --with-clash-detection
@@ -482,6 +485,10 @@
 
 
 %changelog
+* Sun Sep 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-3
+- Adjust to split xemacs-packages-{base,extra}.
+- Provide xemacs(bin) in main package and -nox.
+
 * Sat Sep  2 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-2
 - Fix build when previous revision of the same XEmacs version is installed.
 - BuildRequire compface-devel instead of compface.