[translate-toolkit: 15/15] Merge remote branch 'origin/el6/master'

[dwayne]

commit 481502b410733a6438da9c0b5f25b495c4b79795
Merge: 593867b d11de77
Author: Dwayne Bailey <dwayne at translate.org.za>
Date:   Wed Aug 18 08:33:13 2010 +0200

    Merge remote branch 'origin/el6/master'
    
    Conflicts:
    	.gitignore
    	sources
    	translate-toolkit.spec
    
    Added a number of %{?fedora} and rhel to allow the spec to be portable
    between distro's

 translate-toolkit.spec |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 deletions(-)
---
diff --cc translate-toolkit.spec
index 8f81f1c,315e5ce..679e4b8
--- a/translate-toolkit.spec
+++ b/translate-toolkit.spec
@@@ -11,32 -11,35 +11,39 @@@ URL:            http://translate.source
  Source0:        http://downloads.sourceforge.net/project/translate/Translate%20Toolkit/%{version}/%{name}-%{version}.tar.bz2
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
 -# Fedora patches
++# Common patches
  Patch0:         translate-toolkit-1.5.3-stoplist.patch
  Patch1:         translate-toolkit-1.5.0-langmodel_dir.patch
++# Fedora patches
+ 
+ # EL patches
  
  BuildArch:      noarch
 +%if 0%{?fedora} >= 14
 +BuildRequires:  python2-devel
 +%else
  BuildRequires:  python-devel
 +%endif
  # The following are needed for man page generation
 -# gaupol not packaged for EL-5, sub2po not available
 -#BuildRequires:  gaupol
 -BuildRequires:  python-iniparse
  BuildRequires:  python-lxml
  BuildRequires:  python-simplejson
- BuildRequires:  python-vobject
- Requires:       gettext-libs
- Requires:       python-enchant
 -# python-vobject is not packaged for EL-5
 -#BuildRequires:  python-vobject
++%{?fedora:BuildRequires:  python-vobject}
++%{?fedora:Requires:       gettext-libs}
+ # EL-5 has gettext = 0.14.6.  cPO and new fPO need libgettextpo which was introduced in
+ # 0.14.2.  Some of the improvements since then won't work
 -Requires:       gettext
 -# python-enchant is not yet built for EL-5, spell checking tests will be unavailable
 -#Requires:       python-enchant
++%{?rhel:Requires:       gettext}
++%{?fedora:Requires:       python-enchant}
  Requires:       python-iniparse
  Requires:       python-Levenshtein
  Requires:       python-lxml
 -# python-psyco is not packaged for EL-5
 -#Requires:       python-psyco
 +%ifarch %{ix86}
- Requires:       python-psyco
++%{?fedora:Requires:       python-psyco}
 +%endif
  Requires:       python-simplejson
- Requires:       python-vobject
 -# python-vobject is not packaged for EL-5, ical2po is unavailable
 -#Requires:       python-vobject
++%{?fedora:Requires:       python-vobject}
 +%if 0%{?fedora} >= 14
 +Requires:       aeidon
 +%endif
  
  
  %description
@@@ -85,6 -88,9 +92,11 @@@ toolkit or to use the libraries in othe
  rm -rf $RPM_BUILD_ROOT
  %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
  
++%if 0%{?rhel}
+ # Cleanup some applications that won't work because of missing dependencies
+ rm $RPM_BUILD_ROOT/%{_bindir}/{ical2po,po2ical,sub2po,po2sub}
++%endif
+ 
  # create manpages
  mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
  for program in $RPM_BUILD_ROOT/%{_bindir}/*; do
@@@ -133,25 -139,9 +145,28 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 +* Wed Aug 18 2010 Dwayne Bailey <dwayne at translate.org.za> - 1.8.0-1
 +- Update to 1.8.0
 +   - Required for Pootle 2.1 and recommended for Pootle 2.0
 +   - File formats: Adobe Flex, Mac OS X strings, Haiku catkeys
 +   - Terminology: Improvements to poterminology and terminology suggestions
 +   - Other improvements: Improvements to indexing performance and reliability
 +     in Pootle
 +- Drop patches: zh lambda, moz2po output directory
 +
 +* Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 1.7.0-4
 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 +
 +* Thu Jul 22 2010 Dwayne Bailey <dwayne at translate.org.za> - 1.7.0-3
 +- Depend on aeidon for subtitle support
 +- Backport r14946 to fix rhbz#603597 - moz2po output to directory
 +
 +* Mon Jun 7 2010 Dwayne Bailey <dwayne at translate.org.za> - 1.7.0-2
 +- Backport upstream r14600 to fix rhbz#600561
 +
+ * Thu May 13 2010 Dwayne Bailey <dwayne at translate.org.za> - 1.7.0-2
+ - Align spec with EL-5, fixing missing dependencies
+ 
  * Thu May 13 2010 Dwayne Bailey <dwayne at translate.org.za> - 1.7.0-1
  - Update to 1.7.0
     - Support for Array constructs in the PHP converter