rpms/xemacs-sumo/devel xemacs-sumo.spec,1.16,1.17

Ville Skytta (scop) fedora-extras-commits at redhat.com
Sun Mar 5 19:20:42 UTC 2006


Author: scop

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

Modified Files:
	xemacs-sumo.spec 
Log Message:
* Fri Mar  3 2006 Ville Skyttä <ville.skytta at iki.fi> - 20051208-2
- Drop JDE; the full source for jde.jar doesn't seem to be available
  and even the included parts won't build with gcj eg. due to use of
  com.sun.* things.  Additionally it requires third party jars which are
  not currently available in Fedora Core or Extras.  So let's not inflict
  a crippled version of JDE on anyone; JDE users can install the upstream
  jde package using XEmacs package tools. (#180941)



Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xemacs-sumo.spec	14 Feb 2006 21:52:24 -0000	1.16
+++ xemacs-sumo.spec	5 Mar 2006 19:20:41 -0000	1.17
@@ -1,9 +1,10 @@
 %define sumo    2005-12-08
 %define pkgdir  %{_datadir}/xemacs
+%define xemacsb xemacs-nox -batch -vanilla
 
 Name:           xemacs-sumo
 Version:        %(echo %{sumo} | tr -d -)
-Release:        1
+Release:        2
 Summary:        XEmacs lisp packages
 
 Group:          Applications/Editors
@@ -20,7 +21,6 @@
 Source15:       Emacs.ad.ko_KR.UTF-8
 Source16:       Emacs.ad.zh_CN.UTF-8
 Source17:       Emacs.ad.zh_TW.UTF-8
-Source20:       %{name}-jde-mktoc.pl
 Patch0:         %{name}-20051208-hypb-posix.patch
 Patch1:         %{name}-20051208-pydoc-path.patch
 Patch2:         %{name}-20051208-latin-unity-kludge.patch
@@ -30,8 +30,6 @@
 Patch8:         egg-wnn-host-unix-79826.patch
 Patch11:        browse-url-htmlview-84262.patch
 Patch12:        psgml-browsers-84262.patch
-Patch13:        jde-ug-rel-links.patch
-Patch14:        jde-ug-section-links-89499.patch
 Patch15:        avoid-catch-error-65346.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -109,10 +107,6 @@
 %patch11 -p0
 # update psgml-html preview menu to modern browsers
 %patch12 -p0
-# fix relative links to elisp in user-guide html doc
-%patch13 -p0
-# and section links in toc
-%patch14 -p0
 # catch harmless errors in mouse-avoidance-too-close-p (avoid.el)
 %patch15 -p0
 
@@ -124,35 +118,29 @@
 # remove game we shouldn't ship
 rm xemacs-packages/lisp/games/tetris.el*
 
-# get rid of binary-only tli_rbl treeview applet + some cruft in jde docs
-cd xemacs-packages/etc/jde/doc
-for foo in jdebug jde ; do
-    %{__perl} %{SOURCE20} \
-        html/$foo-ug/$foo-ug-toc.html tli_rbl/txt/$foo-ug-toc.txt \
-        > html/$foo-ug/$foo-ug-toc.html.tmp
-    mv html/$foo-ug/$foo-ug-toc.html.tmp html/$foo-ug/$foo-ug-toc.html
-done
-rm -rf tli_rbl src
-cd -
-
 rm xemacs-packages/etc/xslt-process/java/{xslt.jar,xslt/*.class}
 
+# not buildable from sources, all deps not met, see 2006-03-03 changelog entry
+%{xemacsb} -l package-admin -eval \
+  "(package-admin-delete-binary-package 'jde \"xemacs-packages\")"
+rm -rf xemacs-packages/{etc,lisp}/jde
 
-%build
-export xemacs_batch="xemacs-nox -batch -vanilla"
-
-# mew is provided by mew-xemacs, and skk by ddskk-xemacs
-$xemacs_batch -l package-admin -eval \
+# provided by mew-xemacs
+%{xemacsb} -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 \
+
+# provided by ddskk-xemacs
+%{xemacsb} -l package-admin -eval \
   "(package-admin-delete-binary-package 'skk \"mule-packages\")"
 rmdir mule-packages/{etc,lisp,man}/skk
 
+
+%build
 export EMACSPACKAGEPATH=`pwd`
-$xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" \
+%{xemacsb} -no-autoloads -eval "(setq make-backup-files nil)" \
   -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/*
-$xemacs_batch -f batch-byte-recompile-directory \
+%{xemacsb} -f batch-byte-recompile-directory \
   xemacs-packages/lisp mule-packages/lisp
 
 cd xemacs-packages/etc/xslt-process/java
@@ -237,6 +225,14 @@
 
 
 %changelog
+* Fri Mar  3 2006 Ville Skyttä <ville.skytta at iki.fi> - 20051208-2
+- Drop JDE; the full source for jde.jar doesn't seem to be available
+  and even the included parts won't build with gcj eg. due to use of
+  com.sun.* things.  Additionally it requires third party jars which are
+  not currently available in Fedora Core or Extras.  So let's not inflict
+  a crippled version of JDE on anyone; JDE users can install the upstream
+  jde package using XEmacs package tools. (#180941)
+
 * Sun Feb 12 2006 Ville Skyttä <ville.skytta at iki.fi>
 - Build xslt.jar ourselves (TrAX only), use TrAX by default in xslt-process.
 




More information about the fedora-extras-commits mailing list