[gtranslator/f12/master] Sync with devel

[supercyper]

commit a61be01f7ef39910bddbd350d7f18144b3d4c4d9
Author: Chen Lei <supercyper at 163.com>
Date:   Sat Jul 31 10:34:05 2010 +0800

    Sync with devel

 gtranslator.spec |   44 --------------------------------------------
 sources          |    4 ----
 2 files changed, 0 insertions(+), 48 deletions(-)
---
diff --git a/gtranslator.spec b/gtranslator.spec
index 867593a..8653313 100644
--- a/gtranslator.spec
+++ b/gtranslator.spec
@@ -1,39 +1,3 @@
-<<<<<<< HEAD
-Name:           gtranslator
-Version:        1.9.6
-Release:        2%{?dist}
-Summary:        Gettext po file editor for GNOME
-
-Group:          Development/Tools
-License:        GPLv2+
-URL:            http://gtranslator.sourceforge.net
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtranslator/1.9/%{name}-%{version}.tar.bz2
-# Bug reported: http://bugzilla.gnome.org/show_bug.cgi?id=584608
-Patch0:         %{name}-1.9.6-fix-update-desktop-database.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  gettext
-BuildRequires:  db4-devel
-BuildRequires:  GConf2-devel, gtksourceview2-devel
-BuildRequires:  apr-devel, apr-util-devel, neon-devel, subversion-devel
-BuildRequires:  gtkspell-devel, libsoup-devel, gucharmap-devel, gnome-utils-devel
-BuildRequires:  libgdl-devel
-BuildRequires:  perl(XML::Parser)
-BuildRequires:  desktop-file-utils
-BuildRequires:  scrollkeeper, intltool
-BuildRequires:  gnome-doc-utils
-BuildRequires:  libuuid-devel
-
-Requires:       yelp
-Requires:       which
-Requires(post): scrollkeeper
-Requires(postun): scrollkeeper
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
-=======
 Name:		gtranslator
 Version:	1.9.11
 Release:	3%{?dist}
@@ -53,7 +17,6 @@ Requires:	hicolor-icon-theme
 Requires(pre):	GConf2
 Requires(post):	GConf2
 Requires(preun):GConf2
->>>>>>> f13/master
 
 %description
 gtranslator is an enhanced gettext po file editor for the GNOME
@@ -74,10 +37,6 @@ developing applications that use %{name}.
 %prep
 %setup -q
 %patch0 -p1 -z .fix-update
-<<<<<<< HEAD
-
-=======
->>>>>>> f13/master
 
 %build
 %configure --disable-static	--disable-scrollkeeper \
@@ -146,8 +105,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/gtk-doc/html/gtranslator
 
 %changelog
-<<<<<<< HEAD
-=======
 * Fri Jul 16 2010 Chen Lei <supercyper at 163.com> - 1.9.11-3
 - Disable debugging flags(-ggdb -DDEBUG)
 - Fix to honor %%{optflags} correctly
@@ -172,7 +129,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Fri Apr 23 2010 Gianluca Sforna <giallu gmail com> - 1.9.10-1
 - new upstream release
 
->>>>>>> f13/master
 * Thu Nov  5 2009 Bill Nottingham <notting at redhat.com> - 1.9.6-2
 - Rebuild against newer libgdl
 
diff --git a/sources b/sources
index 0149073..dce0685 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-a801d18edf63ee53b48495089d8935fe  gtranslator-1.9.6.tar.bz2
-=======
 c24727599a57f30be87c6267199f5c81  gtranslator-1.9.11.tar.bz2
->>>>>>> f13/master