rpms/xemacs-sumo/FC-4 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xemacs-sumo.spec, 1.9, 1.10 xemacs-sumo-jde-equal.patch, 1.1, NONE xemacs-sumo-sql-abbrev.patch, 1.1, NONE xemacs-sumo-w3.css, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	.cvsignore sources xemacs-sumo.spec 
Removed Files:
	xemacs-sumo-jde-equal.patch xemacs-sumo-sql-abbrev.patch 
	xemacs-sumo-w3.css 
Log Message:
Sync with devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Jun 2005 21:00:01 -0000	1.5
+++ .cvsignore	23 Jul 2005 12:29:57 -0000	1.6
@@ -1,3 +1,2 @@
-xemacs-mule-sumo-2005-05-05.tar.bz2
-xemacs-sumo-2005-05-05.tar.bz2
-cc-mode-1.45-pkg.tar.gz
+xemacs-mule-sumo-2005-07-15.tar.bz2
+xemacs-sumo-2005-07-15.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Jun 2005 21:00:01 -0000	1.5
+++ sources	23 Jul 2005 12:29:57 -0000	1.6
@@ -1,3 +1,2 @@
-561bac71479bc400173c21c854c37beb  xemacs-mule-sumo-2005-05-05.tar.bz2
-f98700b3db3ce279fe2c4234806f7dfa  xemacs-sumo-2005-05-05.tar.bz2
-e1a2e251e57f29ce6e082181c13c7f04  cc-mode-1.45-pkg.tar.gz
+016362256e4de4b150d6c2f8d686dd3f  xemacs-mule-sumo-2005-07-15.tar.bz2
+28b92fa2e0bcd0c8e81fd6286d37af30  xemacs-sumo-2005-07-15.tar.bz2


Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/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:40 -0000	1.9
+++ xemacs-sumo.spec	23 Jul 2005 12:29:57 -0000	1.10
@@ -1,94 +1,81 @@
-%define sumo_ver 2005-05-05
+%define sumo    2005-07-15
+%define pkgdir  %{_datadir}/xemacs
 
-Summary: XEmacs Lisp packages
-Name: xemacs-sumo
-Version: %(echo %{sumo_ver} | tr -d -)
-Release: 4.1
-License: GPL
-Group: Applications/Editors
-Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo_ver}.tar.bz2
-Source1: ftp://ftp.xemacs.org/packages/xemacs-mule-sumo-%{sumo_ver}.tar.bz2
-Source2: %{name}-w3.css
-Source3: ftp://ftp.xemacs.org/beta/experimental/packages/cc-mode-1.45-pkg.tar.gz
-Source10: Emacs.ad.ja_JP.eucJP
-Source11: Emacs.ad.ko_KR.eucKR
-Source12: Emacs.ad.zh_CN.GB2312
-Source13: Emacs.ad.zh_TW.Big5
-Source14: Emacs.ad.ja_JP.UTF-8
-Source15: Emacs.ad.ko_KR.UTF-8
-Source16: Emacs.ad.zh_CN.UTF-8
-Source17: Emacs.ad.zh_TW.UTF-8
-URL: http://www.xemacs.org/Documentation/packageGuide.html#The_Sumo_Tarball
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: xemacs-nox perl /sbin/install-info
-Requires: xemacs-common
-Conflicts: xemacs < 21.4.12-12
-BuildArch: noarch
-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
-Patch0: %{name}-jde-equal.patch
-Patch1: %{name}-sql-abbrev.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
+Name:           xemacs-sumo
+Version:        %(echo %{sumo} | tr -d -)
+Release:        1
+Summary:        XEmacs lisp packages
+
+Group:          Applications/Editors
+License:        GPL
+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
+Source10:       Emacs.ad.ja_JP.eucJP
+Source11:       Emacs.ad.ko_KR.eucKR
+Source12:       Emacs.ad.zh_CN.GB2312
+Source13:       Emacs.ad.zh_TW.Big5
+Source14:       Emacs.ad.ja_JP.UTF-8
+Source15:       Emacs.ad.ko_KR.UTF-8
+Source16:       Emacs.ad.zh_CN.UTF-8
+Source17:       Emacs.ad.zh_TW.UTF-8
+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)
+
+BuildArch:      noarch
+BuildRequires:  xemacs-nox
+BuildRequires:  sed >= 3.95
+BuildRequires:  /sbin/install-info
+Requires:       xemacs-common
+Provides:       apel-xemacs = 10.2
+Provides:       ruby-mode-xemacs
+Obsoletes:      apel-xemacs < 10.6-6
+Obsoletes:      ruby-mode-xemacs
+Obsoletes:      tm
+Conflicts:      xemacs < 21.4.12-12
 
 %description
-XEmacs (like GNU Emacs) is a self-documenting, customizable,
-extensible, real-time display editor. XEmacs is self-documenting
-because at any time you can type control-h to find out what your
-options are or find out what a command does. XEmacs is customizable
-because you can change the definitions of XEmacs commands. XEmacs is
-extensible because you can write entirely new commands-programs in the
-Lisp language to be run by Emacs' own Lisp interpreter. XEmacs
-includes a real-time display, which means that the text being edited
-is visible on the screen and is updated very frequently (usually after
-every character or pair of characters) as you type.
-
-The XEmacs Sumo packages contain a large collection of useful
-Lisp packages for XEmacs including mailreaders, programming modes
-and utilities, and mule related packages.
-
-%package el
-Summary: The .el source files for the XEmacs Sumo packages.
-Group: Applications/Editors
-Requires: xemacs-sumo = %{version}
-Conflicts: xemacs-el < 21.4.12-12
-
-%description el
-xemacs-sumo-el is not needed to run XEmacs. You only need to install it if
-you are planning to incorporate some Lisp programming into your XEmacs
-experience.
-
-%package info
-Summary: Information files for XEmacs.
-Group: Applications/Editors
-Conflicts: xemacs-info < 21.4.12-12
-
-%description info
-This package contains optional info files that are distributed
-with the XEmacs Sumo packages.
+XEmacs is a highly customizable open source text editor and
+application development system.  It is protected under the GNU General
+Public License and related to other versions of Emacs, in particular
+GNU Emacs.  Its emphasis is on modern graphical user interface support
+and an open software development model, similar to Linux.
+
+The XEmacs Sumo packages contain a large collection of useful lisp
+packages for XEmacs including mailreaders, programming modes and
+utilities, and packages related to using XEmacs in multi-lingual
+environments.
+
+%package        el
+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
+files for the XEmacs Sumo packages, mainly of interest when developing
+or debugging the packages.
+
+%package        info
+Summary:        XEmacs packages documentation in GNU texinfo format
+Group:          Documentation
+Conflicts:      xemacs-info < 21.4.12-12
+
+%description    info
+This package contains optional documentation for the XEmacs Sumo
+packages in GNU texinfo format
 
-%define pkgdir %{_datadir}/xemacs
 
 %prep
 %setup -q -c -a1
-%{__tar} zx -C xemacs-packages -f %{SOURCE3}
-# fix font-lock warnings in JDE
-%patch0 -p0
-# fix abbrev error when loading sql-mode
-%patch1 -p0
 # fix jlatex autodetection
 %patch6 -p0
 # use ptex rather jtex by default for Japanese
@@ -106,87 +93,89 @@
 # catch harmless errors in mouse-avoidance-too-close-p (avoid.el)
 %patch15 -p0
 
-rm xemacs-packages/etc/w3/stylesheet
-install -pm 644 %{SOURCE2} xemacs-packages/etc/w3/stylesheet
-
-perl -pi -e "s|/usr/local/bin/perl5?|/usr/bin/perl|g" \
+sed -i -e "s|/usr/local/bin/perl5\\?|/usr/bin/perl|g" \
   xemacs-packages/{lisp/hyperbole/file-newer,etc/bbdb/*.pl}
 
-chmod +x \
-  xemacs-packages/etc/bbdb/*.pl \
-  xemacs-packages/etc/erc/servers.pl \
-  xemacs-packages/etc/ess/config.guess \
-  xemacs-packages/etc/idlwave/idlwave_catalog
-
 # remove game we shouldn't ship
 rm xemacs-packages/lisp/games/tetris.el*
 
 
 %build
-%define _xemacs_batch xemacs-nox -batch -vanilla
+export 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)" \
+$xemacs_batch -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 \
+$xemacs_batch -f batch-byte-recompile-directory \
   xemacs-packages/lisp mule-packages/lisp
 
 
 %install
-rm -rf %buildroot
+rm -rf $RPM_BUILD_ROOT
 
-# install packages in buildroot
-mkdir -p %buildroot%{pkgdir}
-cp -rp xemacs-packages mule-packages %buildroot%{pkgdir}
-
-( cd %buildroot%{pkgdir}/mule-packages/etc/app-defaults
-  mkdir {de_DE,fr_FR,ro_RO,ja_JP,ko_KR,zh_CN,zh_TW}.UTF-8 ja_JP.eucJP ko_KR.eucKR zh_CN.GB2312 zh_TW.Big5
-  iconv -f ISO-8859-1 -t UTF-8 de/Emacs > de_DE.UTF-8/Emacs
-  iconv -f ISO-8859-1 -t UTF-8 fr/Emacs > fr_FR.UTF-8/Emacs
-  iconv -f ISO-8859-16 -t UTF-8 ro/Emacs > ro_RO.UTF-8/Emacs
-  mv de de_DE
-  mv fr fr_FR
-  mv ro ro_RO
-  install -m 644 %SOURCE10 ja_JP.eucJP/Emacs
-  install -m 644 %SOURCE11 ko_KR.eucKR/Emacs
-  install -m 644 %SOURCE12 zh_CN.GB2312/Emacs
-  install -m 644 %SOURCE13 zh_TW.Big5/Emacs
-  install -m 644 %SOURCE14 ja_JP.UTF-8/Emacs
-  install -m 644 %SOURCE15 ko_KR.UTF-8/Emacs
-  install -m 644 %SOURCE16 zh_CN.UTF-8/Emacs
-  install -m 644 %SOURCE17 zh_TW.UTF-8/Emacs
-## don't seem to appear in manifest
-#  ln -s ja_JP.eucJP ja_JP
-#  ln -s ko_KR.eucKR ko_KR
-#  ln -s zh_CN.GB2312 zh_CN
-#  ln -s zh_TW.Big5 zh_TW
-)
+mkdir -p $RPM_BUILD_ROOT%{pkgdir}
+cp -rp xemacs-packages mule-packages $RPM_BUILD_ROOT%{pkgdir}
 
-# Make sure nothing is 0400
-chmod -R a+rX  %buildroot/usr
+cd $RPM_BUILD_ROOT%{pkgdir}/mule-packages/etc/app-defaults
+mkdir {de_DE,fr_FR,ro_RO,ja_JP,ko_KR,zh_CN,zh_TW}.UTF-8 \
+  ja_JP.eucJP ko_KR.eucKR zh_CN.GB2312 zh_TW.Big5
+iconv -f ISO-8859-1  -t UTF-8 de/Emacs > de_DE.UTF-8/Emacs
+iconv -f ISO-8859-1  -t UTF-8 fr/Emacs > fr_FR.UTF-8/Emacs
+iconv -f ISO-8859-16 -t UTF-8 ro/Emacs > ro_RO.UTF-8/Emacs
+mv de de_DE
+mv fr fr_FR
+mv ro ro_RO
+install -pm 644 %{SOURCE10} ja_JP.eucJP/Emacs
+install -pm 644 %{SOURCE11} ko_KR.eucKR/Emacs
+install -pm 644 %{SOURCE12} zh_CN.GB2312/Emacs
+install -pm 644 %{SOURCE13} zh_TW.Big5/Emacs
+install -pm 644 %{SOURCE14} ja_JP.UTF-8/Emacs
+install -pm 644 %{SOURCE15} ko_KR.UTF-8/Emacs
+install -pm 644 %{SOURCE16} zh_CN.UTF-8/Emacs
+install -pm 644 %{SOURCE17} zh_TW.UTF-8/Emacs
+# these don't seem to appear in manifest
+#ln -s ja_JP.eucJP ja_JP
+#ln -s ko_KR.eucKR ko_KR
+#ln -s zh_CN.GB2312 zh_CN
+#ln -s zh_TW.Big5 zh_TW
+cd -
 
 # info docs: pre-generate "dir"s and compress files
-for file in %buildroot%{pkgdir}/*-packages/info/*.info ; do
+for file in $RPM_BUILD_ROOT%{pkgdir}/*-packages/info/*.info ; do
   /sbin/install-info $file `dirname $file`/dir
 done
-find %buildroot%{pkgdir} -type f -name '*.info*' | xargs -r gzip -9
+find $RPM_BUILD_ROOT%{pkgdir} -type f -name '*.info*' | xargs gzip -9
 
 # separate files
 rm -f *.files base-files el-files info-files
-echo "%defattr(-,root,root)" > base-files
-echo "%defattr(-,root,root)" > el-files
-echo "%defattr(-,root,root)" > info-files
+echo "%%defattr(-,root,root,-)" > base-files
+echo "%%defattr(-,root,root,-)" > el-files
+echo "%%defattr(-,root,root,-)" > info-files
+
+find $RPM_BUILD_ROOT%{pkgdir}/* \
+  \( -type f -name '*.el.orig' -exec rm '{}' ';' \) -o \
+  \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \
+  \( -type d -name info -fprint info.files -prune \) -o \
+  \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \
+  \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o \
+     -fprint base-el-not-bytecomped.files \) \)
 
-find %buildroot%{pkgdir}/* \( -type f -name '*.el.orig' -exec rm '{}' ';' \) -o \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \( -type d -name info -fprint info.files -prune \) -o \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o -fprint base-el-not-bytecomped.files \) \)
-
-perl -pi -e "s|%buildroot||" *.files
+sed -i -e "s|$RPM_BUILD_ROOT||" *.files
 cat base-*.files dir.files >> base-files
-cat el-*.files dir.files >> el-files
-cat info.files >> info-files
+cat el-*.files   dir.files >> el-files
+cat info.files             >> info-files
 
 
 %clean
-rm -rf %buildroot
+rm -rf $RPM_BUILD_ROOT
 
 
 %files -f base-files
@@ -197,6 +186,15 @@
 
 
 %changelog
+* Sat Jul 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050715-1
+- 2005-07-15; jde font-lock, sql-mode abbrev, w3 stylesheet and file
+  permissions fixed upstream.
+- Use sed instead of perl for in-place edits during build.
+
+* Wed Jul 13 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050505-7
+- Remove mew and skk, they're in separate packages again (#162952).
+- Reformat specfile.
+
 * Thu Jun  2 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050505-4.1
 - Make sure we're using files included in this package
   when byte-recompiling patched *.el; also allows the byte-compilation


--- xemacs-sumo-jde-equal.patch DELETED ---


--- xemacs-sumo-sql-abbrev.patch DELETED ---


--- xemacs-sumo-w3.css DELETED ---