[pootle: 8/8] Merge remote branch 'origin/el5/master'

[dwayne]

commit ec789eb5d4890bb34c283c5550b45fd875979681
Merge: b502560 9c2a98c
Author: Dwayne Bailey <dwayne at translate.org.za>
Date:   Wed Aug 18 14:22:53 2010 +0200

    Merge remote branch 'origin/el5/master'
    
    Conflicts:
    	pootle.spec
    
    Many alterations to support RHEL and Fedora

 pootle.spec |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)
---
diff --cc pootle.spec
index 8a06673,623819c..da2a714
--- a/pootle.spec
+++ b/pootle.spec
@@@ -21,16 -21,20 +21,20 @@@ BuildArch:      noarc
  BuildRequires:  python-devel
  BuildRequires:  translate-toolkit >= 1.4.1
  Requires:       Django >= 1.0
- Requires:       iso-codes
 -# iso-codes is not packaged for EL-5
 -#Requires:       iso-codes
++%{?fedora:Requires:       iso-codes}
  Requires:       memcached
  Requires:       mod_wsgi
  Requires:       python-djblets
  Requires:       python-lxml
  Requires:       python-memcached
  Requires:       python-Levenshtein
+ # EL-5 uses Python 2.4 and thus needs sqlite2
 -Requires:       python-sqlite2
++%{?rhel:Requires:       python-sqlite2}
  Requires:       translate-toolkit >= 1.5.1
 -# Xapian is not packaged for EL-5
 -#Requires:       xapian-bindings-python >= 1.0.13
 -#Requires:       xapian-core
++%if 0%{?fedora}{?rhel}>=6
 +Requires:       xapian-bindings-python >= 1.0.13
 +Requires:       xapian-core
++%endif
  Requires:       zip
  # This is for /sbin/service
  Requires(post): initscripts
@@@ -113,7 -117,9 +117,11 @@@ f
  %config(noreplace) %{_sysconfdir}/httpd/conf.d/pootle.conf
  %{python_sitelib}/*
  %{_datadir}/pootle
 -# %{_sharedstatedir} doesn't work on EL-5
 -#%attr(-,apache,apache) %{_sharedstatedir}/pootle
++%if 0%{?fedora}{?rhel}>=6
 +%attr(-,apache,apache) %{_sharedstatedir}/pootle
++%else
+ %attr(-,apache,apache) /var/lib/pootle
++%endif
  # We exclude docs as the Pootle installer doesn't do ${name}-${version} as expected in Fedora
  %exclude %{_datadir}/doc/pootle