[epiphany/f14/master] 2.30.5

[Matthias Clasen]

commit 4ab265bc74f2f4be18abc76de1b12df64a35825f
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Aug 31 22:52:04 2010 -0400

    2.30.5

 .gitignore    |    1 +
 epiphany.spec |   22 +++++-----------------
 sources       |    2 +-
 3 files changed, 7 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 42ce06d..667505e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 epiphany-2.31.5.tar.bz2
 /epiphany-2.30.3.tar.bz2
+/epiphany-2.30.5.tar.bz2
diff --git a/epiphany.spec b/epiphany.spec
index 25369b7..31d2e1c 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -8,8 +8,8 @@
 Summary: Web browser for GNOME
 Name: epiphany
 Epoch: 1
-Version: 2.30.3
-Release: 2%{?dist}
+Version: 2.30.5
+Release: 1%{?dist}
 %define major_version 2.30
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -119,21 +119,8 @@ export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
 	%{enable_nm}
 make %{?_smp_mflags}
 
-# strip unneeded translations from .mo files
-# ideally intltool (ha!) would do that for us
-# http://bugzilla.gnome.org/show_bug.cgi?id=474987
-cd po
-grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
-mv POTFILES.keep POTFILES.in
-intltool-update --pot
-for p in *.po; do
-  msgmerge $p %{name}.pot > $p.out
-  msgfmt -o `basename $p .po`.gmo $p.out
-done
-
 
 %install
-rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
@@ -205,8 +192,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/HighContrastLargePrint &> /dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/HighContrastLargePrintInverse &> /dev/null || :
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -236,6 +221,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 31 2010 Matthias Clasen <mclasen at redhat.com> - 1:2.30.5-1
+- Update to 2.30.5
+
 * Mon Aug 23 2010 Matthias Clasen <mclasen at redhat.com> - 1:2.30.3-2
 - Co-own /usr/share/gtk-doc
 
diff --git a/sources b/sources
index 7fd3670..aa2f5ce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6c6f83d07bd6277ddd20d641af253b0c  epiphany-2.30.3.tar.bz2
+992111ff6f598e1e445735f4d87ec936  epiphany-2.30.5.tar.bz2