[chatzilla] Use patches in bmo #605001

Tue Mar 8 00:34:12 UTC 2011

commit fa62daeb72a68349af9a34a6b14d7ed0683052c2
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date:   Tue Mar 8 00:32:41 2011 +0000

    Use patches in bmo #605001

 chatzilla-0.9.86-meta-reorder.patch |   19 +++++++++++++++++++
 chatzilla-0.9.86-unwrap-frame.patch |   12 ++++++++++++
 chatzilla.spec                      |   18 +++++++++++-------
 3 files changed, 42 insertions(+), 7 deletions(-)
---

diff --git a/chatzilla-0.9.86-meta-reorder.patch b/chatzilla-0.9.86-meta-reorder.patch
new file mode 100644
index 0000000..23b65bb
--- /dev/null
+++ b/chatzilla-0.9.86-meta-reorder.patch
@@ -0,0 +1,19 @@
+diff -r 6c302afa1b50 xul/content/output-window.html
+--- a/xul/content/output-window.html	Tue Jan 18 18:56:12 2011 +0100
++++ b/xul/content/output-window.html	Mon Feb 07 06:23:39 2011 +0100
+@@ -3,6 +3,7 @@
+ 
+ <html>
+     <head>
++      <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+       <style type="text/css">
+         [hidden="true"] {
+           display: none;
+@@ -77,7 +78,6 @@
+         
+       </style>
+ 
+-      <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+       <script type="application/x-javascript" src="chrome://chatzilla/content/output-window.js"></script>
+     </head>
+ 
diff --git a/chatzilla-0.9.86-unwrap-frame.patch b/chatzilla-0.9.86-unwrap-frame.patch
new file mode 100644
index 0000000..a46dc5f
--- /dev/null
+++ b/chatzilla-0.9.86-unwrap-frame.patch
@@ -0,0 +1,12 @@
+diff -r 3ac98c0b45d3 xul/content/static.js
+--- a/xul/content/static.js	Sat Nov 06 23:55:02 2010 +0100
++++ b/xul/content/static.js	Sat Nov 13 06:02:40 2010 +0100
+@@ -3043,7 +3043,7 @@
+     for (var i = 0; i < client.deck.childNodes.length; i++)
+     {
+         frame = client.deck.childNodes[i];
+-        if (getContentWindow(frame) == window)
++        if (frame.contentWindow == window)
+             return frame;
+     }
+     return undefined;
diff --git a/chatzilla.spec b/chatzilla.spec
index 4bcfcbb..fd04b26 100644
--- a/chatzilla.spec
+++ b/chatzilla.spec
@@ -4,7 +4,7 @@
 
 Name:           chatzilla
 Version:        0.9.86
-Release:        7.%{rev}hg%{?dist}
+Release:        8.%{rev}hg%{?dist}
 Summary:        Standalone Mozilla IRC Client, no browsers attached
 
 Group:          Applications/Internet
@@ -14,7 +14,6 @@ Source0:        http://hg.mozilla.org/chatzilla/archive/%{changeset}.tar.bz2
 Source1:        %{name}.schemas
 Source2:        %{name}.1
 Source3:        README
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zip desktop-file-utils python
 Requires:       xulrunner hicolor-icon-theme
@@ -25,6 +24,10 @@ BuildArch:      noarch
 Patch0:         %{name}-%{version}-%{changeset}-xulrunner.patch
 # Patch1 : this patch is needed if we want to add menus after to the ui
 Patch1:         %{name}-%{version}-add-menupopupids.patch
+# Patch2 : https://bugzilla.mozilla.org/show_bug.cgi?id=605001
+Patch2:         %{name}-%{version}-unwrap-frame.patch
+# Patch3 : https://bugzilla.mozilla.org/show_bug.cgi?id=605001
+Patch3:         %{name}-%{version}-meta-reorder.patch
 
 %description
 ChatZilla is normally used as part of SeaMonkey, or an extension 
@@ -44,6 +47,8 @@ to IRC handlers on gnome
 %setup -q -n %{name}-%{changeset}
 %patch0 -p1 -b .xr
 %patch1 -p1 -b .add-menupopupids
+%patch2 -p1 -b .unwrap-frame
+%patch3 -p1 -b .meta-reorder
 
 sed -i 's|@REVISION@|%{version}|g' xpi/resources/{application.ini,brand.properties,brand.dtd,chatzilla-prefs.xr.js}
 sed -i 's|@BUILDID@|%{buildid}|g' xpi/resources/application.ini
@@ -54,8 +59,6 @@ python makexpi.py
 popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 export DESTDIR=$RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
 export FEDIR=`pwd`
 
@@ -142,9 +145,6 @@ pushd $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/chrome/icons/default
     ln -s chatzilla-window16.xpm default16.xpm
 popd
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
@@ -190,6 +190,10 @@ fi
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Mon Mar 07 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.9.86-8.1292hg
+- Use patches from bmo #605001
+- Remove BuildRoot and Clean sections.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.86-7.1292hg
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
