[evolution/f15/master] Try again

[Matthias Clasen]

commit c21fda84373da9021a929a41f467a34cf30cd761
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Fri Feb 11 09:48:39 2011 -0500

    Try again

 evolution-help-gl.patch |   12 ++++++++++++
 evolution.spec          |   39 +++++----------------------------------
 2 files changed, 17 insertions(+), 34 deletions(-)
---
diff --git a/evolution-help-gl.patch b/evolution-help-gl.patch
new file mode 100644
index 0000000..e03b5ef
--- /dev/null
+++ b/evolution-help-gl.patch
@@ -0,0 +1,12 @@
+diff -up evolution-2.91.6.1/help/gl/evolution.xml.gl evolution-2.91.6.1/help/gl/evolution.xml
+--- evolution-2.91.6.1/help/gl/evolution.xml.gl	2011-02-11 09:46:55.942967407 -0500
++++ evolution-2.91.6.1/help/gl/evolution.xml	2011-02-11 09:47:14.788731802 -0500
+@@ -214,7 +214,7 @@
+     <section id="first-step">
+      <title>Definición da súa identidade</title>
+      <para>A xanela de identidade é o primeiro paso do asistente.</para>
+-     <para>Aquí pode introducir para información persoal básica. Pode definir varias identidades máis adiante premendo Editar &gl; Preferencias, despois premendo en «Contas de correo».</para>
++     <para>Aquí pode introducir para información persoal básica. Pode definir varias identidades máis adiante premendo Editar gl Preferencias, despois premendo en «Contas de correo».</para>
+      <para>When the First-Run Assistant starts, the Welcome page is displayed. Click Forward to proceed to the Identity window.</para>
+      <orderedlist>
+       <listitem id="bstfhex">
diff --git a/evolution.spec b/evolution.spec
index 4285167..f6f2b16 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -48,6 +48,8 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch
 # RH bug #589555
 Patch13: evolution-2.30.1-help-contents.patch
 
+Patch15: evolution-help-gl.patch
+
 ## Dependencies ###
 
 Requires(pre): GConf2
@@ -203,6 +205,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %setup -q -n evolution-%{version}
 %patch10 -p1 -b .ldaphack
 %patch13 -p1 -b .help-contents
+%patch14 -p1 -b .help-gl
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -247,39 +250,8 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-com
 export tagname=CC
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasing"
 
-# Strip unneeded translations from .mo files.
-# This reduces the RPM size by several megabytes.
-#disabled since 2.31.91 because of a msgmerge floating point exception (see RH bug 628073)
-#cd po
-#grep -v ".*[.]desktop[.]in[.]in$" POTFILES.in > POTFILES.keep
-#mv POTFILES.keep POTFILES.in
-#intltool-update --gettext-package=%{name}-%{evo_base_version} --pot
-#for p in *.po; do
-#	msgmerge $p %{name}-%{evo_base_version}.pot > $p.out
-#	msgfmt -o `basename $p .po`.gmo $p.out
-#done
-#cd -
-
-# Replace identical images in the help by links.
-# This reduces the RPM size by several megabytes.
-helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
-for f in $helpdir/C/figures/*.png; do
-  b="$(basename $f)"
-  for d in $helpdir/*; do
-    if [ -d "$d" -a "$d" != "$helpdir/C" ]; then
-      g="$d/figures/$b"
-      if [ -f "$g" ]; then
-        if cmp -s $f $g; then
-          rm "$g"; ln -s "../../C/figures/$b" "$g"
-        fi
-      fi
-    fi
-  done
-done
-
 
 %install
-rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 export tagname=CC
 make LIBTOOL=/usr/bin/libtool DESTDIR=$RPM_BUILD_ROOT install
@@ -372,9 +344,6 @@ fi
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f translations.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
@@ -606,6 +575,8 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Fri Feb 11 2011 Matthias Clasen <mclasen at redhat.com> - 2.91.6.1-4
 - Rebuild against newer gtk
+- Fix a problem with gl help translations
+- Drop %%clean
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.91.6.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild