[ejabberd/f13/master] No hevea for s390 s390x and no hevea for EL-6

[Peter Lemenkov]

commit 37dded5f5b58c6e4d43baa1c75b37b5820d119d6
Author: Peter Lemenkov <peter at fedoraproject.org>
Date:   Fri Jun 18 11:08:50 2010 +0000

    No hevea for s390 s390x and no hevea for EL-6

 ejabberd.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/ejabberd.spec b/ejabberd.spec
index 398eb1a..fed8b7f 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -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-authenticate-against-SASL-GSSAPI.patch
 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