rpms/xemacs-sumo/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xemacs-sumo.spec, 1.11, 1.12 xemacs-sumo-jde-equal.patch, 1.1, NONE xemacs-sumo-sql-abbrev.patch, 1.1, NONE xemacs-sumo-w3.css, 1.1, NONE

Sun Jul 17 16:37:59 UTC 2005

Author: scop

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

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:
* 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.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/.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	17 Jul 2005 16:37: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/devel/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	17 Jul 2005 16:37: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/devel/xemacs-sumo.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xemacs-sumo.spec	16 Jul 2005 16:49:51 -0000	1.11
+++ xemacs-sumo.spec	17 Jul 2005 16:37:57 -0000	1.12
@@ -1,9 +1,9 @@
-%define sumo    2005-05-05
+%define sumo    2005-07-15
 %define pkgdir  %{_datadir}/xemacs
 
 Name:           xemacs-sumo
 Version:        %(echo %{sumo} | tr -d -)
-Release:        7
+Release:        1
 Summary:        XEmacs lisp packages
 
 Group:          Applications/Editors
@@ -11,8 +11,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:        %{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
@@ -21,8 +19,6 @@
 Source15:       Emacs.ad.ko_KR.UTF-8
 Source16:       Emacs.ad.zh_CN.UTF-8
 Source17:       Emacs.ad.zh_TW.UTF-8
-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
@@ -35,7 +31,7 @@
 
 BuildArch:      noarch
 BuildRequires:  xemacs-nox
-BuildRequires:  perl
+BuildRequires:  sed >= 3.95
 BuildRequires:  /sbin/install-info
 Requires:       xemacs-common
 Provides:       apel-xemacs = 10.2
@@ -80,11 +76,6 @@
 
 %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
@@ -102,18 +93,9 @@
 # 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*
 
@@ -166,9 +148,6 @@
 #ln -s zh_TW.Big5 zh_TW
 cd -
 
-# make sure nothing is 0400
-chmod -R a+rX $RPM_BUILD_ROOT%{_prefix}
-
 # info docs: pre-generate "dir"s and compress files
 for file in $RPM_BUILD_ROOT%{pkgdir}/*-packages/info/*.info ; do
   /sbin/install-info $file `dirname $file`/dir
@@ -189,7 +168,7 @@
   \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o \
      -fprint base-el-not-bytecomped.files \) \)
 
-perl -pi -e "s|$RPM_BUILD_ROOT||" *.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
@@ -207,6 +186,11 @@
 
 
 %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.


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


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


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


