rpms/ejabberd/EL-6 ejabberd.spec,1.58,1.59

[Peter Lemenkov]

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24229

Modified Files:
	ejabberd.spec 
Log Message:
No hevea for s390 s390x and no hevea for EL-6


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-6/ejabberd.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- ejabberd.spec	12 Jun 2010 13:54:06 -0000	1.58
+++ ejabberd.spec	18 Jun 2010 11:18:09 -0000	1.59
@@ -1,17 +1,17 @@
 %global uid 27
 
 # Currently, hevea available only in Fedora and EL-6
-%if 0%{?el6}%{?fedora}
+%if 0%{?fedora}
 # No hevea for ppc64
 # see https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253
-%ifnarch ppc64
+%ifnarch ppc64 s390 s390x
 %define with_hevea 1
 %endif
 %endif
 
 Name:           ejabberd
 Version:        2.1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -54,7 +54,9 @@ Patch6: ejabberd-0006-Support-to-authent
 Patch7: ejabberd-0007-Change-directory-to-readable-by-everyone.patch
 # Fix so-lib permissions while installing (will be proposed for inclusion into upstream)
 Patch8:	ejabberd-0008-Install-.so-objects-with-0755-permissions.patch
+# Applied upstream
 Patch9:	ejabberd-0009-Install-more-docs-by-default.patch
+# Applied upstream
 Patch10: ejabberd-0010-Install-COPYING-file-along-with-other-docs.patch
 
 
@@ -355,6 +357,10 @@ rm -rf %{buildroot}
 %doc %{_docdir}/%{name}-%{version}/*.txt
 
 %changelog
+* Fri Jun 18 2010 Peter Lemenkov <lemenkov at gmail.com> 2.1.4-2
+- No hevea for EL-6
+- No hevea for s390 and s390x
+
 * Fri Jun  4 2010 Peter Lemenkov <lemenkov at gmail.com> 2.1.4-1
 - Ver. 2.1.4
 - Rebased patches