rpms/xemacs-sumo/FC-5 xemacs-sumo-20051208-aspellenc-190151.patch, NONE, 1.1 xemacs-sumo-20060510-browse-url-htmlview-84262.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xemacs-sumo.spec, 1.17, 1.18 browse-url-htmlview-84262.patch, 1.1, NONE xemacs-sumo-20051208-latin-unity-kludge.patch, 1.1, NONE xemacs-sumo-20051208-pydoc-path.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Wed May 10 20:15:58 UTC 2006
- Previous message (by thread): fedora-security/audit fe4,1.17,1.18 fe5,1.17,1.18
- Next message (by thread): rpms/xemacs-sumo/devel xemacs-sumo-20051208-aspellenc-190151.patch, NONE, 1.1 xemacs-sumo-20060510-browse-url-htmlview-84262.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xemacs-sumo.spec, 1.17, 1.18 browse-url-htmlview-84262.patch, 1.1, NONE xemacs-sumo-20051208-latin-unity-kludge.patch, 1.1, NONE xemacs-sumo-20051208-pydoc-path.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/extras/rpms/xemacs-sumo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23272/FC-5
Modified Files:
.cvsignore sources xemacs-sumo.spec
Added Files:
xemacs-sumo-20051208-aspellenc-190151.patch
xemacs-sumo-20060510-browse-url-htmlview-84262.patch
Removed Files:
browse-url-htmlview-84262.patch
xemacs-sumo-20051208-latin-unity-kludge.patch
xemacs-sumo-20051208-pydoc-path.patch
Log Message:
* Wed May 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 20060510-1
- 2006-05-10; pydoc and latin-unity patches applied upstream.
- Adapt ispell.el to aspell >= 0.60's encoding behaviour (#190151).
- Drop no longer relevant obsoletes and conflicts.
- Add version to xemacs-common dependency.
- Fix build with XEmacs 21.5.x.
- Don't ship mule-ucs for 21.5.x.
- Require main package in -info.
xemacs-sumo-20051208-aspellenc-190151.patch:
--- NEW FILE xemacs-sumo-20051208-aspellenc-190151.patch ---
--- xemacs-sumo-20051208/xemacs-packages/lisp/ispell/ispell.el~ 2005-10-16 19:47:08.000000000 +0300
+++ xemacs-sumo-20051208/xemacs-packages/lisp/ispell/ispell.el 2006-04-29 22:42:03.000000000 +0300
@@ -2249,6 +2249,12 @@
(expand-file-name ispell-personal-dictionary)))))
(setq args (append args ispell-extra-args))
+ ;; Fix encoding with aspell >= 0.60 (and blindly assume it's >= 0.60
+ ;; if it looks like aspell :P)
+ (when (string-match "^aspell" (file-name-nondirectory ispell-program-name))
+ (add-to-list
+ 'args (concat "--encoding=" (symbol-name (ispell-get-coding-system)))))
+
(if ispell-async-processp
(let ((process-connection-type ispell-use-ptys-p))
(apply 'start-process
xemacs-sumo-20060510-browse-url-htmlview-84262.patch:
--- NEW FILE xemacs-sumo-20060510-browse-url-htmlview-84262.patch ---
--- xemacs-packages/lisp/mail-lib/browse-url.el~ 2005-03-09 13:14:56.000000000 +0200
+++ xemacs-packages/lisp/mail-lib/browse-url.el 2006-05-10 20:35:52.000000000 +0300
@@ -566,7 +566,7 @@
:group 'browse-url)
;;;###autoload
-(defcustom browse-url-generic-program nil
+(defcustom browse-url-generic-program "htmlview"
"*The name of the browser program used by `browse-url-generic'."
:type '(choice string (const :tag "None" nil))
:group 'browse-url)
@@ -615,12 +615,12 @@
:type 'number
:group 'browse-url)
-(defcustom browse-url-kde-program "kfmclient"
+(defcustom browse-url-kde-program "konqueror"
"*The name by which to invoke the KDE web browser."
:type 'string
:group 'browse-url)
-(defcustom browse-url-kde-args '("openURL")
+(defcustom browse-url-kde-args nil
"*A list of strings defining options for `browse-url-kde-program'."
:type '(repeat (string :tag "Argument"))
:group 'browse-url)
@@ -872,6 +872,7 @@
xterm, MMM, and then W3."
(apply
(cond
+ (browse-url-generic-program 'browse-url-generic)
((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz)
((executable-find browse-url-mozilla-program) 'browse-url-mozilla)
((executable-find browse-url-firefox-program) 'browse-url-firefox)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 12 Feb 2006 15:16:39 -0000 1.8
+++ .cvsignore 10 May 2006 20:15:58 -0000 1.9
@@ -1,3 +1,2 @@
-xemacs-mule-sumo-2005-12-08.tar.bz2
-xemacs-sumo-2005-12-08.tar.bz2
-gnus-1.89-pkg.tar.gz
+xemacs-mule-sumo-2006-05-10.tar.bz2
+xemacs-sumo-2006-05-10.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 12 Feb 2006 15:16:39 -0000 1.8
+++ sources 10 May 2006 20:15:58 -0000 1.9
@@ -1,3 +1,2 @@
-553da38bc36b4365ab98e0565a0530b8 xemacs-mule-sumo-2005-12-08.tar.bz2
-1927c40affd04ff7c10b979ef24548d0 xemacs-sumo-2005-12-08.tar.bz2
-e7707178416716eac643af29c437f619 gnus-1.89-pkg.tar.gz
+62cce3c50de3b102df15e1e223b79dbd xemacs-mule-sumo-2006-05-10.tar.bz2
+242938f820b85ae27e8584de3afbcb80 xemacs-sumo-2006-05-10.tar.bz2
Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/FC-5/xemacs-sumo.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xemacs-sumo.spec 5 Mar 2006 19:20:41 -0000 1.17
+++ xemacs-sumo.spec 10 May 2006 20:15:58 -0000 1.18
@@ -1,10 +1,11 @@
-%define sumo 2005-12-08
+%define sumo 2006-05-10
%define pkgdir %{_datadir}/xemacs
%define xemacsb xemacs-nox -batch -vanilla
+%define xemver %(rpm -q --qf=%%{VERSION} xemacs-nox 2>/dev/null || echo ERROR)
Name: xemacs-sumo
Version: %(echo %{sumo} | tr -d -)
-Release: 2
+Release: 1%{?dist}
Summary: XEmacs lisp packages
Group: Applications/Editors
@@ -12,7 +13,6 @@
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 +22,12 @@
Source16: Emacs.ad.zh_CN.UTF-8
Source17: Emacs.ad.zh_TW.UTF-8
Patch0: %{name}-20051208-hypb-posix.patch
-Patch1: %{name}-20051208-pydoc-path.patch
-Patch2: %{name}-20051208-latin-unity-kludge.patch
+Patch1: %{name}-20051208-aspellenc-190151.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
+Patch11: %{name}-20060510-browse-url-htmlview-84262.patch
Patch12: psgml-browsers-84262.patch
Patch15: avoid-catch-error-65346.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -40,14 +39,12 @@
BuildRequires: %{__python}
BuildRequires: %{__perl}
BuildRequires: java-devel
-Requires: xemacs-common
+Requires: xemacs-common >= %{xemver}
# Fake release in this provision in order to avoid self-obsoletion (for now).
Provides: apel-xemacs = 10.6-6
Provides: ruby-mode-xemacs
Obsoletes: apel-xemacs < 10.6-6
Obsoletes: ruby-mode-xemacs
-Obsoletes: tm
-Conflicts: xemacs < 21.4.12-12
%description
XEmacs is a highly customizable open source text editor and
@@ -65,7 +62,6 @@
Summary: Emacs lisp source files for the XEmacs Sumo packages
Group: Development/Libraries
Requires: xemacs-sumo = %{version}
-Conflicts: xemacs-el < 21.4.12-12
%description el
This package is not needed to run XEmacs; it contains the lisp source
@@ -75,7 +71,7 @@
%package info
Summary: XEmacs packages documentation in GNU texinfo format
Group: Documentation
-Conflicts: xemacs-info < 21.4.12-12
+Requires: xemacs-sumo = %{version}
%description info
This package contains optional documentation for the XEmacs Sumo
@@ -84,17 +80,12 @@
%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
-# find pydoc_lisp.py out-of-the-box
-%patch1 -p0
-install -dm 755 xemacs-packages/etc/python-modes
-mv xemacs-packages/{lisp/python-modes/pydoc_lisp.py,etc/python-modes}
-# support write-region's kludge in latin-unity
-%patch2 -p0
+# adapt ispell.el to aspell >= 0.60's encoding behaviour, #190151
+%patch1 -p1
# use TrAX by default in xslt-process
%patch3 -p0
# fix jlatex autodetection
@@ -113,7 +104,8 @@
sed -i -e "s|/usr/local/bin/perl5\\?|/usr/bin/perl|g" \
xemacs-packages/etc/bbdb/*.pl
-chmod -c -x xemacs-packages/lisp/edit-utils/crm.el
+chmod -c -x xemacs-packages/lisp/edit-utils/crm.el \
+ xemacs-packages/{lisp/erc/ChangeLog.2005.upstream,man/erc/erc.texi}
# remove game we shouldn't ship
rm xemacs-packages/lisp/games/tetris.el*
@@ -135,11 +127,18 @@
"(package-admin-delete-binary-package 'skk \"mule-packages\")"
rmdir mule-packages/{etc,lisp,man}/skk
+# not needed (and unusable) with >= 21.5
+if [ "$(rpm -q --qf=%%{VERSION} xemacs-nox)" '>' "21.5." ] ; then
+%{xemacsb} -l package-admin -eval \
+ "(package-admin-delete-binary-package 'mule-ucs \"mule-packages\")"
+rm -rf mule-packages/{etc,lisp,man}/mule-ucs
+fi
+
%build
export EMACSPACKAGEPATH=`pwd`
-%{xemacsb} -no-autoloads -eval "(setq make-backup-files nil)" \
- -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/*
+%{xemacsb} -no-autoloads -l autoload -eval "(setq make-backup-files nil)" \
+ -f batch-update-autoloads xemacs-packages/lisp/* mule-packages/lisp/*
%{xemacsb} -f batch-byte-recompile-directory \
xemacs-packages/lisp mule-packages/lisp
@@ -225,6 +224,15 @@
%changelog
+* Wed May 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 20060510-1
+- 2006-05-10; pydoc and latin-unity patches applied upstream.
+- Adapt ispell.el to aspell >= 0.60's encoding behaviour (#190151).
+- Drop no longer relevant obsoletes and conflicts.
+- Add version to xemacs-common dependency.
+- Fix build with XEmacs 21.5.x.
+- Don't ship mule-ucs for 21.5.x.
+- Require main package in -info.
+
* 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
--- browse-url-htmlview-84262.patch DELETED ---
--- xemacs-sumo-20051208-latin-unity-kludge.patch DELETED ---
--- xemacs-sumo-20051208-pydoc-path.patch DELETED ---
- Previous message (by thread): fedora-security/audit fe4,1.17,1.18 fe5,1.17,1.18
- Next message (by thread): rpms/xemacs-sumo/devel xemacs-sumo-20051208-aspellenc-190151.patch, NONE, 1.1 xemacs-sumo-20060510-browse-url-htmlview-84262.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xemacs-sumo.spec, 1.17, 1.18 browse-url-htmlview-84262.patch, 1.1, NONE xemacs-sumo-20051208-latin-unity-kludge.patch, 1.1, NONE xemacs-sumo-20051208-pydoc-path.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list