rpms/xemacs/devel xemacs.spec,1.5,1.6

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	xemacs.spec 
Log Message:
Fine tune dependencies and options of "--without mule" builds.


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xemacs.spec	29 Jun 2005 21:20:17 -0000	1.5
+++ xemacs.spec	29 Jun 2005 21:27:37 -0000	1.6
@@ -44,8 +44,10 @@
 BuildRequires:  compface
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
+%if 0%{!?_without_mule:1}
 BuildRequires:  Canna-devel
 BuildRequires:  FreeWnn-devel
+%endif # mule
 %if 0%{?_with_gtk:1}
 BuildRequires:  gtk+-devel
 BuildRequires:  libglade-devel
@@ -67,7 +69,7 @@
 GNU Emacs.  Its emphasis is on modern graphical user interface support
 and an open software development model, similar to Linux.
 
-This package contains XEmacs built for X Windows with MULE support.
+This package contains XEmacs built for X Windows%{!?_without_mule: with MULE support}.
 
 %package        common
 Summary:        Byte-compiled lisp files and other common files for XEmacs
@@ -226,7 +228,7 @@
 ./configure $common_options \
   --docdir=%{exectop}/doc/ \
   --with-sound=native \
-  %{!?_without_mule:--with-canna=yes --with-xim=xlib} \
+  --with-xim=xlib \
 %if 0%{?_with_gtk:1}
   --with-gtk \
   --with-gnome \
@@ -404,6 +406,7 @@
 * Thu Jun 30 2005 Ville Skyttä <ville.skytta at iki.fi> - 21.4.17-4
 - Improve package summaries and descriptions, reformat/clean up specfile.
 - Bring back Wnn support.
+- Fine tune dependencies and options of "--without mule" builds.
 
 * Thu May  5 2005 Ville Skyttä <ville.skytta at iki.fi> - 21.4.17-3
 - Avoid stack corruption in open-network-stream when built with gcc4