summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2010-06-26 07:28:55 +0200
committerRemi Collet <fedora@famillecollet.com>2010-06-26 07:28:55 +0200
commit7229051e0e88541b98aa685a3580d0995eafbdfc (patch)
treea924273a78e627e4e9b42fce5ecd843fefdd6e9b
parent81868beec261ef20910d9427384cad000cb36935 (diff)
Fix thunderbird lcms requires + workaround for extensions
-rw-r--r--thunderbird.sh.in2
-rw-r--r--thunderbird.spec8
2 files changed, 7 insertions, 3 deletions
diff --git a/thunderbird.sh.in b/thunderbird.sh.in
index 0630fd3..1bd3ab7 100644
--- a/thunderbird.sh.in
+++ b/thunderbird.sh.in
@@ -81,6 +81,8 @@ fi
# Modify language pack configuration only when thunderbird is not running
# and language packs are not disabled
if [ $MOZILLA_DOWN -ne 0 ]; then
+ # Remi Workaround for extensions
+ rm -f $HOME/.thunderbird/*/extensions.ini
# Clear already installed langpacks
mkdir -p $MOZ_EXTENSIONS_PROFILE_DIR
diff --git a/thunderbird.spec b/thunderbird.spec
index 2c740d1..a9b49b5 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -2,6 +2,7 @@
%define nss_version 3.12.3.99
%define cairo_version 1.8.8
%define freetype_version 2.1.9
+%define lcms_version 1.19
%define sqlite_version 3.6.22
%define libnotify_version 0.4
%define build_langpacks 1
@@ -122,8 +123,8 @@ Requires: mozilla-filesystem
Requires: nspr >= %{nspr_version}
Requires: nss >= %{nss_version}
%endif
-%if 0%{?fedora} >= 13
-Requires: sqlite >= %{sqlite_version}
+%if %{fedora} >= 9
+BuildRequires: lcms-devel >= %{lcms_version}
%endif
Obsoletes: thunderbird3
@@ -182,7 +183,7 @@ ac_add_options --enable-libnotify
%else
ac_add_options --disable-libnotify
%endif
-%if %{fedora} >= 9
+%if %{fedora} >= 11
ac_add_options --enable-system-lcms
%endif
%if %{fedora} >= 13
@@ -474,6 +475,7 @@ fi
%changelog
* Fri Jun 25 2010 Remi Collet <rpms@famillecollet.com> 3.1-1
- update to 3.1 finale
+- add poor workaround for extensions
* Thu Jun 24 2010 Jan Horak <jhorak@redhat.com> - 3.1-1
- Thunderbird 3.1