[mozilla-firetray] Update to latest snapshot, fixes rhbz #754204
Hicham HAOUARI
hicham at fedoraproject.org
Thu Jan 19 11:07:00 UTC 2012
commit a2149bfa8b3ebafe3a98c803aa452b6a63d05fb5
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date: Thu Jan 19 11:06:52 2012 +0000
Update to latest snapshot, fixes rhbz #754204
.gitignore | 1 +
...a-firetray-0.3.1-bump-max-version-numbers.patch | 16 -------
...illa-firetray-0.3.6-add-chatzilla-support.patch | 0
...a-firetray-0.3.6-bump-max-version-numbers.patch | 11 +++++
...-check-for-install-rdf-before-removing-it.patch | 0
...lla-firetray-0.3.6-use-arch-dep-mozconfig.patch | 0
...illa-firetray-0.3.6-use-first-window-icon.patch | 0
mozilla-firetray.spec | 48 +++++++++++++-------
sources | 2 +-
9 files changed, 44 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0a55bb1..c180803 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
firetray-0.2.8-src.zip
/firetray-0.2.8-src.zip
/firetray-0.3.1-src.zip
+/mozilla-firetray-0.3.6-143svn.tar.bz2
diff --git a/mozilla-firetray-0.3.1-add-chatzilla-support.patch b/mozilla-firetray-0.3.6-add-chatzilla-support.patch
similarity index 100%
rename from mozilla-firetray-0.3.1-add-chatzilla-support.patch
rename to mozilla-firetray-0.3.6-add-chatzilla-support.patch
diff --git a/mozilla-firetray-0.3.6-bump-max-version-numbers.patch b/mozilla-firetray-0.3.6-bump-max-version-numbers.patch
new file mode 100644
index 0000000..aca9c3a
--- /dev/null
+++ b/mozilla-firetray-0.3.6-bump-max-version-numbers.patch
@@ -0,0 +1,11 @@
+--- mozilla-firetray-0.3.1/generate_install_rdf.sh.old 2011-09-10 10:34:23.000000000 +0000
++++ mozilla-firetray-0.3.1/generate_install_rdf.sh 2011-09-10 10:34:53.000000000 +0000
+@@ -18,7 +18,7 @@ SUPPORTED_APPS=( \
+ "Mozilla Firefox;{ec8030f7-c20a-464f-9b0e-13a3a9e97384};3.0;9.*" \
+ "Mozilla Thunderbird;{3550f703-e582-4d05-9a08-453d09bdfdc6};3.0;9.*" \
+ "Songbird;songbird at songbirdnest.com;0.8;1.8.0" \
+-"SeaMonkey;{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a};2.0a1;2.0.* " \
++"SeaMonkey;{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a};2.0a1;2.6.*" \
+ "Sunbird;{718e30fb-e89b-41dd-9da7-e25a45638b28};1.0b1;1.0pre" \
+ "ChatZilla;{59c81df5-4b7a-477b-912d-4e0fdf64e5f2};0.8;0.9.*" \
+ )
diff --git a/mozilla-firetray-0.3.1-check-for-install-rdf-before-removing-it.patch b/mozilla-firetray-0.3.6-check-for-install-rdf-before-removing-it.patch
similarity index 100%
rename from mozilla-firetray-0.3.1-check-for-install-rdf-before-removing-it.patch
rename to mozilla-firetray-0.3.6-check-for-install-rdf-before-removing-it.patch
diff --git a/mozilla-firetray-0.3.1-use-arch-dep-mozconfig.patch b/mozilla-firetray-0.3.6-use-arch-dep-mozconfig.patch
similarity index 100%
rename from mozilla-firetray-0.3.1-use-arch-dep-mozconfig.patch
rename to mozilla-firetray-0.3.6-use-arch-dep-mozconfig.patch
diff --git a/mozilla-firetray-0.3.1-use-first-window-icon.patch b/mozilla-firetray-0.3.6-use-first-window-icon.patch
similarity index 100%
rename from mozilla-firetray-0.3.1-use-first-window-icon.patch
rename to mozilla-firetray-0.3.6-use-first-window-icon.patch
diff --git a/mozilla-firetray.spec b/mozilla-firetray.spec
index dbbfbe2..a954ebd 100644
--- a/mozilla-firetray.spec
+++ b/mozilla-firetray.spec
@@ -2,14 +2,20 @@
%define rel 1
-%define svn 0
+%define svn 1
%if %{svn}
-%define rev 95
+%define rev 143
+%define pre 0.
%endif
%define upname firetray
+%define xr_min_version 9
+%define ff_min_version 9
+%define tb_min_version 9
+%define sm_min_version 2.6
+
%define ft_guid \{9533f794-00b4-4354-aa15-c2bbda6989f8\}
%define ff_guid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
@@ -23,9 +29,9 @@
%define mz_ext_dir %{_libdir}/mozilla/extensions/
Name: mozilla-firetray
-Version: 0.3.1
+Version: 0.3.6
%if %{svn}
-Release: %{?pre}%{rel}.%{rev}svn%{?dist}.1
+Release: %{?pre}%{rel}.%{rev}svn%{?dist}
%else
Release: %{rel}%{?dist}
%endif
@@ -36,11 +42,11 @@ License: GPLv2 and CC-BY-SA
URL: http://code.google.com/p/firetray
%if %{svn}
# This is an svn snapshot, to get this tarball, use :
-# svn checkout -r %%{rev} http://firetray.googlecode.com/svn/trunk/ firetray-read-only
-# rm -rf `find firetray-read-only -name '.svn'`
-# mv firetray-read-only %%{upname}-%%{version}-%%{rev}svn
-# tar cjf %%{upname}-%%{version}-%%{rev}svn.tar.bz2 %%{upname}-%%{version}-%%{rev}svn
-Source0: %{upname}-%{version}-%{rev}svn.tar.bz2
+# svn checkout -r %%{rev} http://firetray.googlecode.com/svn/trunk/ %%{name}-%%{version}-%%{rev}svn
+# cd %%{name}-%%{version}-%%{rev}svn
+# svn export . %%{name}-%%{version}-%%{rev}svn
+# tar cjf %%{name}-%%{version}-%%{rev}svn.tar.bz2 %%{name}-%%{version}-%%{rev}svn
+Source0: %{name}-%{version}-%{rev}svn.tar.bz2
%else
Source0: http://%{upname}.googlecode.com/files/%{upname}-%{version}-src.zip
%endif
@@ -48,12 +54,18 @@ Source0: http://%{upname}.googlecode.com/files/%{upname}-%{version}-src.z
# Patch0: Backported from upstream svn
# http://code.google.com/p/firetray/source/detail?r=125
Patch0: %{name}-%{version}-bump-max-version-numbers.patch
+
# Patch1: Check for install.rdf before removing it during the build
+# http://code.google.com/p/firetray/issues/detail?id=212
Patch1: %{name}-%{version}-check-for-install-rdf-before-removing-it.patch
+
+#Patch2 http://code.google.com/p/firetray/issues/detail?id=191
Patch2: %{name}-%{version}-use-arch-dep-mozconfig.patch
+
# Patch3 : use the window icon
# http://code.google.com/p/firetray/issues/detail?id=190
-Patch3: %{name}-%{version}-use-first-window-icon.patch
+Patch3: %{name}-%{version}-use-first-window-icon.patch
+
# Patch4 : Add a missing hunk that was missing during the merge
# http://code.google.com/p/firetray/issues/detail?id=189
Patch4: %{name}-%{version}-add-chatzilla-support.patch
@@ -92,7 +104,7 @@ it for thunderbird, install mozilla-firetray-thunderbird package.
%package firefox
Summary: System tray extension for firefox
-Requires: firefox >= 6.0
+Requires: firefox >= %{ff_min_version}
Requires: %{name}-core = %{version}-%{release}
%description firefox
@@ -108,7 +120,7 @@ Firetray is a system tray addon for firefox, current features are :
%package thunderbird
Summary: System tray extension for thunderbird
-Requires: thunderbird >= 6.0
+Requires: thunderbird >= %{tb_min_version}
Requires: %{name}-core = %{version}-%{release}
%description thunderbird
@@ -125,7 +137,7 @@ Firetray is a system tray addon for thunderbird, current features are :
%package seamonkey
Summary: System tray extension for seamonkey
-Requires: seamonkey >= 2.3
+Requires: seamonkey >= %{sm_min_version}
Requires: %{name}-core = %{version}-%{release}
%description seamonkey
@@ -160,7 +172,7 @@ Firetray is a system tray addon for sunbird, current features are :
%package chatzilla
Summary: System tray extension for chatzilla
-Requires: chatzilla
+Requires: xulrunner >= %{xr_min_version}
Requires: %{name}-core = %{version}-%{release}
%description chatzilla
@@ -176,11 +188,13 @@ Firetray is a system tray addon for chatzilla, current features are :
%prep
%if %{svn}
-%setup -q -n %{upname}-%{version}-%{rev}svn
+%setup -q -n %{name}-%{version}-%{rev}svn
%else
%setup -q -c %{upname}-%{version}
%endif
+sed -i "s|header.py|python '+ gecko_sdk_bin + '/' + 'header.py|g" components/SConscript
+sed -i "s|typelib.py|python '+ gecko_sdk_bin + '/' + 'typelib.py|g" components/SConscript
%patch0 -p1 -b .bump-max-version-numbers
%patch1 -p1 -b .check-for-install-rdf-before-removing-it
%patch2 -p1 -b .use-arch-dep-mozconfig
@@ -273,8 +287,8 @@ end
%changelog
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Mon Jan 16 2012 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.3.6-0.1.143svn
+- Update to latest snapshot, fixes rhbz #754204
* Thu Sep 08 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.3.1-1
- Update to 0.3.1
diff --git a/sources b/sources
index 4a27db6..3453ceb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d907cb2f12ec8272597fc44821bb27fb firetray-0.3.1-src.zip
+eb511e1159994e0f6dd5472b5e374439 mozilla-firetray-0.3.6-143svn.tar.bz2
More information about the scm-commits
mailing list