[shotwell] Get gettext to actually generate translated strings (# 642092)

[Michel Alexandre Salim]

commit ba403acd9f9229b1f75dd0f4c24f53087d63e146
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Fri Mar 18 00:43:50 2011 +0100

    Get gettext to actually generate translated strings (# 642092)

 .gitignore    |    1 -
 shotwell.spec |   14 +++++---------
 sources       |    1 -
 3 files changed, 5 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2bcb2f1..31277af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 /shotwell-0.8.90-r2758.tar.xz
-/shotwell-0.8.90-locale-langpack.tar.xz
diff --git a/shotwell.spec b/shotwell.spec
index ac53a85..a792dd9 100644
--- a/shotwell.spec
+++ b/shotwell.spec
@@ -14,12 +14,6 @@ URL:            http://www.yorba.org/shotwell/
 # git archive --format=tar --prefix=%{name}-%{version}/ \
 # `git svn find-rev %{svnrev}` | xz - > %{name}-%{version}-%{svnrev}.tar.xz
 Source0:        shotwell-%{version}-%{svnrev}.tar.xz
-# precomputed language pack, since there is no network access
-# during the build process
-#
-# make locale-langpack/.langstamp
-# tar cf - locale-langpack | xz - > %{name}-%{version}-locale-langpack.tar.xz
-Source1:        shotwell-%{version}-locale-langpack.tar.xz
 Patch0:         shotwell-0.8.90-mimetype.patch
 
 BuildRequires:  vala-devel >= 0.11.7
@@ -51,7 +45,7 @@ environment. It allows you to import photos from your camera, view and edit
 them, and share them with others.
 
 %prep
-%setup -q -a1
+%setup -q
 %patch0 -p1 -b .mimetype
 
 %build
@@ -65,6 +59,8 @@ make %{?_smp_mflags}
 %install
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 export XDG_DISABLE_MAKEFILE_UPDATES=1
+# otherwise gettext always returns English text regardless of LANGUAGE asked
+export LANG=en_US.utf8
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
@@ -109,8 +105,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
-* Thu Mar 17 2011 Michel Salim <salimma at fedoraproject.org> - 0.8.90-2.r2758
-- Include pre-generated language packs (# 642092)
+* Fri Mar 18 2011 Michel Salim <salimma at fedoraproject.org> - 0.8.90-2.r2758
+- Get gettext to actually generate translated strings (# 642092)
 
 * Thu Mar 17 2011 Michel Salim <salimma at fedoraproject.org> - 0.8.90-1.r2758
 - Update to 0.9.0 pre-release
diff --git a/sources b/sources
index 7550173..7214e6a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 8c643fbaf9de91a730a91e1b513746a2  shotwell-0.8.90-r2758.tar.xz
-31351456c081d06a0cae4f386ff0a169  shotwell-0.8.90-locale-langpack.tar.xz