[gtranslator/f12/master: 44/44] Merge branch 'f13/master' into f12/master

[supercyper]

commit 853154c2aba1fe7ea7ba367f6dd6115e1a210054
Merge: 7b5b155 1b0baea
Author: Chen Lei <supercyper at 163.com>
Date:   Sat Jul 31 10:21:02 2010 +0800

    Merge branch 'f13/master' into f12/master

 gtranslator.spec |  163 ++++++++++++++++++++++++++++++------------------------
 sources          |    4 +
 2 files changed, 95 insertions(+), 72 deletions(-)
---
diff --cc gtranslator.spec
index 360c04b,8653313..867593a
--- a/gtranslator.spec
+++ b/gtranslator.spec
@@@ -1,37 -1,22 +1,59 @@@
++<<<<<<< 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}
+ Summary:	Gettext po file editor for GNOME
+ Group:		Development/Tools
+ License:	GPLv3
+ 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
+ 
+ BuildRequires:	intltool gnome-doc-utils desktop-file-utils
+ BuildRequires:	db4-devel GConf2-devel libgdl-devel gnome-utils-devel
+ BuildRequires:	gtksourceview2-devel gtkspell-devel gucharmap-devel
+ BuildRequires:	libsoup-devel unique-devel libgda-devel
+ 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
@@@ -52,28 -37,29 +74,33 @@@ developing applications that use %{name
  %prep
  %setup -q
  %patch0 -p1 -z .fix-update
++<<<<<<< HEAD
 +
++=======
++>>>>>>> f13/master
  
  %build
- %configure --disable-static
- make %{?_smp_mflags}
- 
+ %configure --disable-static	--disable-scrollkeeper \
+ 	--disable-schemas-install --enable-debug=no
+ make %{?_smp_mflags} CFLAGS="%{optflags}"
  
  %install
- rm -rf $RPM_BUILD_ROOT
  make install DESTDIR=$RPM_BUILD_ROOT
- rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
- 
- desktop-file-install --vendor fedora --delete-original  \
-         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
-         --remove-category Application \
-         $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
- 
- %find_lang %{name}
- 
- ln doc/UMTF/ChangeLog ChangeLog.UMTF
- 
+ find %{buildroot} -name '*.la' -exec rm -f {} ';'
+ 
+ desktop-file-install --delete-original \
+ 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+ 
+ %find_lang %{name} --with-gnome
+ # Convert to utf-8
+ for file in doc/UMTF/*.UMTF; do
+     iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
+     touch -r $file $file.new && \
+     mv $file.new $file
+ done
+ mkdir UMTF
+ cp -p doc/UMTF/{README.UMTF,ChangeLog,example.xml} UMTF
  
  %clean
  rm -rf $RPM_BUILD_ROOT
@@@ -126,9 -102,33 +143,36 @@@ gtk-update-icon-cache %{_datadir}/icons
  %defattr(-,root,root,-)
  %{_includedir}/gtranslator-2.0
  %{_libdir}/pkgconfig/gtranslator.pc
- 
+ %{_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
+ 
+ * Fri Jul 16 2010 Chen Lei <supercyper at 163.com> - 1.9.11-2
+ - Remove *.la files
+ 
+ * Fri Jul 16 2010 Chen Lei <supercyper at 163.com> - 1.9.11-1
+ - Update to 1.9.11
+ - Clean up spec agaist latest guideline
+ 
+ * Fri Apr 30 2010 Caius 'kaio' Chance <me at kaio.net> - 1.9.10-3
+ - Remove scrollkeeper and desktop-file-utils.
+ - Rarian has placed scrollkeeper and no scriptlet needed for rarian.
+   https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Scrollkeeper
+ 
+ * Thu Apr 29 2010 Caius 'kaio' Chance <me at kaio.net> - 1.9.10-2
+ - Update license info.
+ - Added requires of hicolor-icon-theme.
+ - Converted README.umtf to UTF-8.
+ 
+ * 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 --cc sources
index 44d7302,dce0685..0149073
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +a801d18edf63ee53b48495089d8935fe  gtranslator-1.9.6.tar.bz2
++=======
+ c24727599a57f30be87c6267199f5c81  gtranslator-1.9.11.tar.bz2
++>>>>>>> f13/master