[epiphany/f16] Fix intltool build issue

[Peter Hatina]

commit 4bee936fe3179759ef02a36c5fc9605dd918cbbc
Author: Peter Hatina <phatina at redhat.com>
Date:   Tue Jun 5 15:27:30 2012 +0200

    Fix intltool build issue

 epiphany-intltool-buildfix.patch |   22 ++++++++++++++++++++++
 epiphany.spec                    |    8 +++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/epiphany-intltool-buildfix.patch b/epiphany-intltool-buildfix.patch
new file mode 100644
index 0000000..95f427a
--- /dev/null
+++ b/epiphany-intltool-buildfix.patch
@@ -0,0 +1,22 @@
+diff --git a/m4/intltool.m4 b/m4/intltool.m4
+index 07af68b..839e855 100644
+--- a/m4/intltool.m4
++++ b/m4/intltool.m4
+@@ -66,7 +66,7 @@ INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcar
+ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+        INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+       INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< [$]@' 
++      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
+       INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+       INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+@@ -119,7 +119,7 @@ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+ if test $? -ne 0; then
+    AC_MSG_ERROR([perl 5.8.1 is required for intltool])
+ else
+-   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
++   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+    AC_MSG_RESULT([$IT_PERL_VERSION])
+ fi
+ if test "x$2" != "xno-xml"; then
diff --git a/epiphany.spec b/epiphany.spec
index 15d7710..066da12 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -2,7 +2,7 @@ Summary: Web browser for GNOME
 Name: epiphany
 Epoch: 1
 Version: 3.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 %define major_version 3.1
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -49,6 +49,7 @@ Requires: gsettings-desktop-schemas
 Patch0: epiphany-homepage.patch
 Patch2: epiphany-default-bookmarks.patch
 Patch3: epiphany-bookmarks-toolbar.patch
+Patch4: epiphany-intltool-buildfix.patch
 
 %description
 Epiphany is the web browser for the GNOME desktop. Its goal is to be
@@ -86,6 +87,7 @@ Install epiphany-devel if you want to write extensions for epiphany.
 %patch0 -p1 -b .homepage
 %patch2 -p1 -b .default-bookmarks
 %patch3 -p1 -b .bookmarks-toolbar
+%patch4 -p1 -b .intltool-buildfix
 
 # Fedora Epiphany version
 cat >> data/default-prefs-common.js << EOF
@@ -103,6 +105,7 @@ export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
 %ifnarch s390 s390x
 %define enable_nm --enable-network-manager
 %endif
+autoreconf
 %configure \
 	--with-distributor-name=Fedora \
 	--disable-scrollkeeper \
@@ -189,6 +192,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %{_datadir}/gir-1.0
 
 %changelog
+* Tue Jun 05 2012 Peter Hatina <phatina at redhat.com> - 1:3.2.2-3
+- Fix build issue caused by unsupported intltool-merge option
+
 * Tue Jun 05 2012 Peter Hatina <phatina at redhat.com> - 1:3.2.2-2
 - Added bookmarks toolbutton, fix rhbz#697344