rpms/xemacs-sumo/devel xemacs-sumo.spec,1.9,1.10

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	xemacs-sumo.spec 
Log Message:
Remove mew and skk, they're in separate packages again (#162952).


Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xemacs-sumo.spec	2 Jun 2005 16:56:41 -0000	1.9
+++ xemacs-sumo.spec	13 Jul 2005 20:03:28 -0000	1.10
@@ -3,7 +3,7 @@
 Summary: XEmacs Lisp packages
 Name: xemacs-sumo
 Version: %(echo %{sumo_ver} | tr -d -)
-Release: 6
+Release: 7
 License: GPL
 Group: Applications/Editors
 Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo_ver}.tar.bz2
@@ -27,12 +27,9 @@
 Provides:  ruby-mode-xemacs
 Obsoletes: ruby-mode-xemacs tm
 # Provides/Obsoletes for upgradeability from the latest FC version, needed
-# until (if?) there will be separate apel, mew, and ddskk packages for
-# XEmacs again.  ddskk-xemacs is not provided because the
-# version shipping here is the original skk, not ddskk.  It is obsoleted
-# anyway to for the sake of smooth upgrades.
-Provides: apel-xemacs = 10.2 mew-xemacs = 1.94.2
-Obsoletes: apel-xemacs < 10.6-6 mew-xemacs < 4.1-2 ddskk-xemacs < 12.2.0-5
+# until (if?) there will be a separate apel package for XEmacs again.
+Provides: apel-xemacs = 10.2
+Obsoletes: apel-xemacs < 10.6-6
 Patch0: %{name}-jde-equal.patch
 Patch1: %{name}-sql-abbrev.patch
 Patch6: auctex-texsite-jlatex-detect-69129.patch
@@ -125,6 +122,14 @@
 %build
 %define _xemacs_batch xemacs-nox -batch -vanilla
 
+# mew is provided by mew-xemacs, and skk by ddskk-xemacs
+%_xemacs_batch -l package-admin -eval \
+  "(package-admin-delete-binary-package 'mew \"xemacs-packages\")"
+rmdir xemacs-packages/{etc,lisp,man}/mew
+%_xemacs_batch -l package-admin -eval \
+  "(package-admin-delete-binary-package 'skk \"mule-packages\")"
+rmdir mule-packages/{etc,lisp,man}/skk
+
 export EMACSPACKAGEPATH=`pwd`
 %_xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" \
   -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/*
@@ -197,6 +202,9 @@
 
 
 %changelog
+* Wed Jul 13 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050505-7
+- Remove mew and skk, they're in separate packages again (#162952).
+
 * Thu Jun  2 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050505-6
 - Make sure we're using files included in this package
   when byte-recompiling patched *.el; also allows the byte-compilation