shotwell:

- add new hi-res icons
- add LANG=en_US.utf8 to get gettext to actually generate translated
  strings (for .desktop translation)


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4104 ec354946-7b23-47d6-9f5a-488ba84defc7

s/shotwell/shotwell-vl.spec

@@ -1,6 +1,6 @@
 Name:           shotwell
 Version:        0.8.1
-Release:        3%{?_dist_release}
+Release:        4%{?_dist_release}
 Summary:        A photo organizer for the GNOME desktop
 Summary(ja):    GNOME デスクトップ向けの画像整理ソフト
 
@@ -9,9 +9,10 @@ Group:          Applications/Graphics
 # CC-BY-SA for some of the icons
 License:        LGPLv2+ and CC-BY-SA
 URL:            http://www.yorba.org/shotwell/
+
 Source0:        http://www.yorba.org/download/shotwell/0.8/shotwell-%{version}.tar.bz2
-# svn co svn://svn.yorba.org/shotwell/branches/shotwell-0.4, make dist
+# http://trac.yorba.org/ticket/3379
-#Patch0:         workaround_desktop.patch
+Source1:        shotwell-icons.tar.bz2
 Patch1:         shotwell-0.8.1-vala.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
@@ -38,6 +39,10 @@ BuildRequires:  sqlite3-devel
 BuildRequires:  unique-devel
 BuildRequires:  vala-devel >= 0.9.5
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: kudoh
+
 %description
 Shotwell is a new open source photo organizer designed for the GNOME desktop
 environment. It allows you to import photos from your camera, view and edit
@@ -66,11 +71,20 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 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
 
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/shotwell.desktop
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/shotwell-viewer.desktop
 
+# put hi-res icons in place
+(
+  cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
+  rm -rf 16x16 24x24 scalable
+  tar xf %{SOURCE1}
+)
+      
 %find_lang %{name}
 
 %clean
@@ -118,6 +132,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Jun 10 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8.1-4
+- add hi-res icons (SOURCE1)
+- add LANG=en_US.utf8 to get gettext to actually generate translated strings
+
 * Sat Jun 04 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.8.1-3
 - dropt Patch0
 - added BuildRequires: LibRaw-static