[virtaal: 7/7] Merge remote branch 'origin/el5/master'

dwayne dwayne at fedoraproject.org
Wed Aug 18 07:24:27 UTC 2010 

commit 4092957afe96b9b83b63a71447797705fe2bb2b2
Merge: a1fd04b a7c74aa
Author: Dwayne Bailey <dwayne at translate.org.za>
Date:   Wed Aug 18 09:23:54 2010 +0200

    Merge remote branch 'origin/el5/master'
    
    Conflicts:
    	virtaal.spec
    
    Add some %{rhel} logic

 virtaal.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc virtaal.spec
index 001888d,25874c4..683e124
--- a/virtaal.spec
+++ b/virtaal.spec
@@@ -28,13 -23,13 +28,13 @@@ BuildRequires:  intltoo
  Requires:       translate-toolkit >= 1.5.1
  Requires:       pygtk2
  Requires:       pygtk2-libglade
- Requires:       pygobject2
 -#Requires:       pygobject2
++%{?fedora:Requires:       pygobject2}
  Requires:       python-lxml
  # Virtaal lists the following as optional packages
  # gnome-python2-gtkspell Needed for spell checking
  Requires:       gnome-python2-gtkspell
 -## libtranslate provides access to various MT platforms
 -#Requires:       libtranslate
 +# libtranslate provides access to various MT platforms
- Requires:       libtranslate
++%{?fedora:Requires:       libtranslate}
  # python-Levenshtein provides fast distance measures
  Requires:       python-Levenshtein 
  # python-psycopg2 needed for TinyTM
@@@ -99,6 -93,7 +99,7 @@@ rm -rf %{buildroot
  %{__python} setup.py install -O1 --skip-build --install-data=/usr --nodepcheck --root %{buildroot}
  
  desktop-file-install                                     \
 -   --vendor=""                                           \
++%{?rhel:--vendor=""                                   \}
     --delete-original                                     \
     --dir=%{buildroot}%{_datadir}/applications            \
     %{buildroot}%{_datadir}/applications/%{name}.desktop
@@@ -201,132 -185,10 +202,135 @@@ rm -rf %{buildroot
     - Accessibility improvements
     - Better compliance with system themes
     - New translations: Bulgarian, Icelandic
 +- Drop OpenTran XMLRPC bug #1355
 +- Drop TMController fixes bug #1388
 +
 +* Thu Mar 25 2010 Dwayne Bailey <dwayne at translate.org.za> - 0.5.2-3
 +- Backport TMController fix (bug #1388)
 +
 +* Sat Feb 20 2010 Dwayne Bailey <dwayne at translate.org.za> - 0.5.2-2
 +- Actualy commit the XMLRPC fix
 +- Ensure we build with python2
 +
 +* Fri Jan 29 2010 Dwayne Bailey <dwayne at translate.org.za> - 0.5.2-1
 +- Update to 0.5.2
 +   - Correctly package the lookup plugin that was missing before
 +   - Draw the user's attention if the language pair isn't specified
 +   - Keep track of window sizes and maximisation state
 +   - New autocorrect file for Lithuanian
 +   - New translations: Belarusian, Akan, Polish, Asturian, Japanese, Punjabi
 +   - Several small bug fixes and improvements
 +- Backport OpenTran XMLRPC errors (bug #1355)
 +
 +* Sat Dec 26 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.1-1
 +- Update to 0.5.1
 +   - Fixed URI-handling bug for opening files.
 +   - New translations: Chinese (Taiwan) and Lithuanian.
 +
 +* Thu Dec 3 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.0-1
 +- Update to 0.5.0 final
 +   - Correctly support Open-Tran for languages with regional modifiers
 +   - Web requests now accept compressed responses if the server offers it
 +   - New translations: Ukrainian.
 +   - Various bug fixes
 +- Drop Korean translation fix
 +
 +* Tue Dec 1 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.0-0.2.rc1
 +- Typo in postun
 +
 +* Fri Nov 27 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.0-0.1.rc1
 +- Update to 0.5.0 rc1
 +   - Autoterm: Virtaal can now automatically download terminology files
 +   - Web look-up: select text and and look it up on a web site
 +   - Highlighting of differences in non-100% TM matches
 +   - Language detection to aid in correct choice of language pair
 +   - Informative error handling when adding terms
 +   - New plugins for machine translation with Google and Moses
 +   - New translations: Northern Sotho, Sotho, Songhai, Korean
 +   - Many updated translations
 +   - Various bugfixes.
 +- Update MO generation patch
 +- Fix a msgfmt compile error in Korean translations
 +
 +* Fri Oct 16 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.1-1
 +- Update to 0.4.1
 +   - New translations: Turkish, Finnish, Vietnamese
 +   - Updated translations: Russian, Dutch and Zulu
 +   - More complete handling of "recent files" (bug 1120)
 +   - Better alignment with the GNOME human interface guidelines (bug 1095)
 +   - More reliable ways of obtaining the default font settings (bug 1092)
 +   - Better handling of HTML tags in the Apertium MT module
 +   - Small layout improvements (bug 1045, 1138)
 +- Depend on Translate Toolkit 1.4.1 for fixes to XLIFF, placeable and tmserver
 +
 +* Wed Aug 5 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-1
 +- Update to 0.4.0 final
 +  - Terminology suggestions
 +  - Syntax highlighting
 +  - Support for "placeables" or placeholders
 +  - Support for editing inline elements of XLIFF files
 +  - Improvements to preferences
 +  - Updated translations.
 +  - Improvements for right-to-left languages.
 +
 +* Fri Jul 31 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-0.3.rc2
 +- Update to 0.4.0 rc2:
 +  - More improvements to the RTL interface of Virtaal
 +  - Bugfixes relating to undo and editing XLIFF inline elements 
 +
 +* Fri Jul 24 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-0.2.rc1
 +- Update to 0.4.0 rc1:
 +
 +  Improvements since beta 1:
 +   - User interface improvements, including 
 +     - better English text
 +     - better display on small screens
 +     - better display in right-to-left languages
 +     - updated translations: af, ar, de, en_GB, en_ZA, eu, fr, gl, nl, pt_BR, ru
 +   - Fonts are now configurable
 +   - You can select to which file a new term should be added
 +   - Improvements to comments, including making them selectable
 +   - Updated tutorial
 +   - Handling of inline elements in XLIFF
 +
 +- Drop --nodepcheck patch
 +
 +* Tue Jun 30 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-0.1.beta1
 +- Update to 0.4.0 beta1
 +- Backport r11846 --nodepcheck
 +
 +* Wed Apr 15 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.3.1-3
 +- Update icon installation to latest Fedora guidelines
 +
 +* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 +
 +* Wed Feb 18 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.3.1-1
 +- Update to 0.3.1 release
 +- Package icons
 +
 +* Sat Feb 14 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.3.0-3
 +- Use platform autocorrect files
 +
 +* Sat Feb 14 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.3.0-2
 +- Update to F-10:
 +  - Correct dependency python-psycopg2
 +  - Update to 0.3 final
 +  - Add pycurl, libtranslate, psycopg2 for various TM plugins
 +
 +* Tue Feb 3 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.3-0.2.rc1
 +- Update for 0.3-rc1
 +- Remove version patch
 +
 +* Thu Jan 22 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.3-0.1.beta1
 +- Update for 0.3-beta1 release
 +- Refresh MO setup patch
 +- Add version patch to prevent dependency on Translate Toolkit 
 +  when building
  
+ * Wed Jan 7 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.2-3
+ - vendor tag is needed for desktop-file-install
+ 
  * Sat Dec 6 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-2
  - Cleanups from package review

More information about the scm-commits mailing list