rpms/xemacs/devel xemacs-sitestart.el, 1.5, 1.6 xemacs.spec, 1.30, 1.31

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	xemacs-sitestart.el xemacs.spec 
Log Message:
* Wed Jan  3 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-6
- Fix site-start.el coding system setup in non-UTF8 locales (#213582).
- Fix "--without modules" build.



Index: xemacs-sitestart.el
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs-sitestart.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xemacs-sitestart.el	20 Sep 2006 16:21:20 -0000	1.5
+++ xemacs-sitestart.el	3 Jan 2007 22:00:58 -0000	1.6
@@ -15,7 +15,8 @@
 (setq efs-ftp-program-name "/usr/bin/ftp")
 
 ;; load .el files in "site-start.d/"
-(let ((files (directory-files "/usr/share/xemacs/site-packages/lisp/site-start.d" t "\\.el$")))
+(let ((files (directory-files
+              "/usr/share/xemacs/site-packages/lisp/site-start.d" t "\\.el$")))
   (mapc 'load-file files))
 
 ;; fix default courier italics
@@ -25,7 +26,7 @@
   (make-face-italic 'italic)
   (make-face-italic 'bold-italic))
 
-;; Set up language environment.setup coding-systems
+;; Set up language environment and coding systems
 (when (featurep 'mule)
   (let* ((locale (getenv "LANG"))
          (lang-region (and locale
@@ -115,8 +116,9 @@
            (tmp (substring tmp 0 (string-match "\[ \t\n\]" tmp)))
            (tmp (intern (downcase tmp))))
       (when (find-coding-system tmp)
-        (set-coding-priority-list (list tmp))
-        (set-coding-category-system tmp tmp)
+        (let ((cat (or (coding-system-category tmp) tmp)))
+            (set-coding-priority-list (list cat))
+            (set-coding-category-system cat tmp))
         (set-default-output-coding-systems tmp)
         (set-keyboard-coding-system tmp)
         (set-terminal-coding-system tmp)


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xemacs.spec	2 Oct 2006 18:42:06 -0000	1.30
+++ xemacs.spec	3 Jan 2007 22:00:58 -0000	1.31
@@ -1,7 +1,6 @@
 # TODO: review desktop entry associations
 # TODO: zero-length /usr/share/xemacs-21.5-b26/lisp/dump-paths.el
 # TODO: non-ASCII in buffer tabs
-# TODO: fix --without modules build (../modules/canna_api.o not found?)
 
 %bcond_with     gtk
 %bcond_with     wnn
@@ -20,7 +19,7 @@
 
 Name:           xemacs
 Version:        21.5.27
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -211,24 +210,26 @@
 
 common_options="
     --with-system-packages=%{_datadir}/xemacs
-    --with-pop
-    --with-mail-locking=lockf
+    --without-msw
+%if %{with mule}
+    --with-mule
+%endif
     --with-clash-detection
     --with-database=no
-    --without-postgresql
     --without-ldap
+    --without-postgresql
+    --with-mail-locking=lockf
+    --with-pop
     --without-hesiod
-    --without-msw
-    --with-pdump
-    --with-debug
-    --with-error-checking=none
-    %{?with_mule:--with-mule}
 %ifarch alpha ia64 ppc64
     --with-system-malloc
 %endif
+    --with-pdump
 %if ! %{with modules}
     --without-modules
 %endif
+    --with-debug
+    --with-error-checking=none
 "
 
 %if %{with nox}
@@ -236,10 +237,10 @@
 %configure $common_options \
     --with-docdir=%{_libdir}/xemacs-%{xver}/doc-nox \
     --with-sound=none \
-    --without-x \
+    --with-xim=no \
     --without-canna \
     --without-wnn \
-    --with-xim=no
+    --without-x
 make EMACSDEBUGPATHS=yes # toplevel parallel make fails
 mv lib-src/DOC{,-nox}
 mv src/xemacs{,-nox-%{xver}}
@@ -252,26 +253,27 @@
 
 # build with X
 %configure $common_options \
+    --with-docdir=%{_libdir}/xemacs-%{xver}/doc \
+%if %{with xft}
+    --with-xft=all \
+%else
+    --with-xfs \
+%endif
 %if %{with gtk}
     --with-gtk \
     --with-gnome \
 %else
-    --with-xim=xlib \
     --with-athena=%{?with_xaw3d:3d}%{!?with_xaw3d:next} \
-    --with-widgets=athena \
     --with-menubars=lucid \
-    --with-scrollbars=lucid \
+    --with-widgets=athena \
     --with-dialogs=athena \
+    --with-scrollbars=lucid \
+    --with-xim=xlib \
 %endif
 %if ! %{with wnn}
-    --without-wnn \
-%endif
-%if %{with xft}
-    --with-xft=all \
-%else
-    --with-xfs \
+    --without-wnn
 %endif
-    --with-docdir=%{_libdir}/xemacs-%{xver}/doc
+
 make EMACSDEBUGPATHS=yes # toplevel parallel make fails
 
 
@@ -342,7 +344,7 @@
 chmod -R a+rX $RPM_BUILD_ROOT%{_prefix}
 
 # clean up unneeded stuff (TODO: there's probably much more)
-find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs rm
+find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs -r rm
 rm $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/*linux/gzip-el.sh
 rm $RPM_BUILD_ROOT{%{_bindir}/gnuattach,%{_mandir}/man1/gnuattach.1}
 cd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/etc
@@ -456,13 +458,13 @@
 %doc etc/editclient.sh
 %{_bindir}/etags.xemacs
 %{_bindir}/ootags
-%{_libdir}/xemacs/
 %dir %{_libdir}/xemacs-%{xver}
 %dir %{_libdir}/xemacs-%{xver}/*linux/
 %{_libdir}/xemacs-%{xver}/*linux/[acdfghprsvwy]*
 %{_libdir}/xemacs-%{xver}/*linux/m[am]*
 %{_libdir}/xemacs-%{xver}/*linux/movemail
 %if %{with modules}
+%{_libdir}/xemacs/
 %dir %{_libdir}/xemacs-%{xver}/*linux/modules/
 %{_libdir}/xemacs-%{xver}/*linux/modules/auto-autoloads.elc
 %endif
@@ -482,15 +484,19 @@
 %defattr(-,root,root,-)
 %{_infodir}/*.info*
 
+%if %{with modules}
 %files devel
 %defattr(-,root,root,-)
-%if %{with modules}
 %{_bindir}/ellcc
-%endif
 %{_libdir}/xemacs-%{xver}/*linux/include/
+%endif
 
 
 %changelog
+* Wed Jan  3 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-6
+- Fix site-start.el coding system setup in non-UTF8 locales (#213582).
+- Fix "--without modules" build.
+
 * Mon Oct  2 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-5
 - Rebuild.