rpms/xemacs-sumo/FC-4 xemacs-sumo-20051208-trax.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xemacs-sumo.spec, 1.11, 1.12 jde-ug-rel-links.patch, 1.1, NONE jde-ug-section-links-89499.patch, 1.1, NONE

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


Author: scop

Update of /cvs/extras/rpms/xemacs-sumo/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12874

Modified Files:
	.cvsignore sources xemacs-sumo.spec 
Added Files:
	xemacs-sumo-20051208-trax.patch 
Removed Files:
	jde-ug-rel-links.patch jde-ug-section-links-89499.patch 
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)

* Sun Feb 12 2006 Ville Skyttä <ville.skytta at iki.fi>
- Build xslt.jar ourselves (TrAX only), use TrAX by default in xslt-process.

* Sat Feb 11 2006 Ville Skyttä <ville.skytta at iki.fi>
- Bundle upstream gnus package version 1.89 to fix #181011.
- Get rid of tli_rbl binary only applet jar in jde's docs (first step
  of fixing #180941).


xemacs-sumo-20051208-trax.patch:

--- NEW FILE xemacs-sumo-20051208-trax.patch ---
--- xemacs-packages/lisp/xslt-process/xslt-process.el~	2001-05-01 08:41:45.000000000 +0300
+++ xemacs-packages/lisp/xslt-process/xslt-process.el	2006-02-12 23:57:32.000000000 +0200
@@ -49,3 +49,3 @@
 
-(defcustom xslt-process-default-processor (list 'Saxon)
+(defcustom xslt-process-default-processor (list 'TrAX)
   "*The default XSLT processor to be applied to an XML document."


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Dec 2005 21:22:18 -0000	1.7
+++ .cvsignore	5 Mar 2006 19:29:38 -0000	1.8
@@ -1,2 +1,3 @@
 xemacs-mule-sumo-2005-12-08.tar.bz2
 xemacs-sumo-2005-12-08.tar.bz2
+gnus-1.89-pkg.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Dec 2005 21:22:18 -0000	1.7
+++ sources	5 Mar 2006 19:29:38 -0000	1.8
@@ -1,2 +1,3 @@
 553da38bc36b4365ab98e0565a0530b8  xemacs-mule-sumo-2005-12-08.tar.bz2
 1927c40affd04ff7c10b979ef24548d0  xemacs-sumo-2005-12-08.tar.bz2
+e7707178416716eac643af29c437f619  gnus-1.89-pkg.tar.gz


Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/xemacs-sumo.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xemacs-sumo.spec	23 Dec 2005 21:22:18 -0000	1.11
+++ xemacs-sumo.spec	5 Mar 2006 19:29:38 -0000	1.12
@@ -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
@@ -11,6 +12,7 @@
 URL:            http://www.xemacs.org/Documentation/packageGuide.html#The_Sumo_Tarball
 Source0:        ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo}.tar.bz2
 Source1:        ftp://ftp.xemacs.org/packages/xemacs-mule-sumo-%{sumo}.tar.bz2
+Source2:        ftp://ftp.xemacs.org/packages/gnus-1.89-pkg.tar.gz
 Source10:       Emacs.ad.ja_JP.eucJP
 Source11:       Emacs.ad.ko_KR.eucKR
 Source12:       Emacs.ad.zh_CN.GB2312
@@ -22,13 +24,12 @@
 Patch0:         %{name}-20051208-hypb-posix.patch
 Patch1:         %{name}-20051208-pydoc-path.patch
 Patch2:         %{name}-20051208-latin-unity-kludge.patch
+Patch3:         %{name}-20051208-trax.patch
 Patch6:         auctex-texsite-jlatex-detect-69129.patch
 Patch7:         auctex-texjp-platex.patch
 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)
 
@@ -37,6 +38,8 @@
 BuildRequires:  sed >= 3.95
 BuildRequires:  /sbin/install-info
 BuildRequires:  %{__python}
+BuildRequires:  %{__perl}
+BuildRequires:  java-devel
 Requires:       xemacs-common
 # Fake release in this provision in order to avoid self-obsoletion (for now).
 Provides:       apel-xemacs = 10.6-6
@@ -81,6 +84,8 @@
 
 %prep
 %setup -q -c -a1
+tar zxf %{SOURCE2} -C xemacs-packages
+
 # get rid of csh dependency
 %patch0 -p0
 rm xemacs-packages/lisp/hyperbole/file-newer
@@ -90,6 +95,8 @@
 mv xemacs-packages/{lisp/python-modes/pydoc_lisp.py,etc/python-modes}
 # support write-region's kludge in latin-unity
 %patch2 -p0
+# use TrAX by default in xslt-process
+%patch3 -p0
 # fix jlatex autodetection
 %patch6 -p0
 # use ptex rather jtex by default for Japanese
@@ -100,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
 
@@ -115,24 +118,35 @@
 # remove game we shouldn't ship
 rm xemacs-packages/lisp/games/tetris.el*
 
+rm xemacs-packages/etc/xslt-process/java/{xslt.jar,xslt/*.class}
 
-%build
-export xemacs_batch="xemacs-nox -batch -vanilla"
+# 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
 
-# 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
+javac xslt/TrAX.java && jar cvf xslt.jar xslt/*.class && rm xslt/*.class
+cd -
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -211,6 +225,22 @@
 
 
 %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.
+
+* Sat Feb 11 2006 Ville Skyttä <ville.skytta at iki.fi>
+- Bundle upstream gnus package version 1.89 to fix #181011.
+- Get rid of tli_rbl binary only applet jar in jde's docs (first step
+  of fixing #180941).
+
 * Sat Dec 17 2005 Ville Skyttä <ville.skytta at iki.fi> - 20051208-1
 - Patch to support write-region's kludge in latin-unity.
 


--- jde-ug-rel-links.patch DELETED ---


--- jde-ug-section-links-89499.patch DELETED ---




More information about the fedora-extras-commits mailing list