|
|
@@ -1,7 +1,7 @@
|
|
|
# do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
%define tbmajor 3.1
|
|
|
%define tbversion %{tbmajor}
|
|
|
-%define tbrelease 1%{?_dist_release}
|
|
|
+%define tbrelease 2%{?_dist_release}
|
|
|
|
|
|
# The tarball is pretty inconsistent with directory structure.
|
|
|
# Sometimes there is a top level directory. That goes here.
|
|
|
@@ -18,7 +18,7 @@
|
|
|
|
|
|
%define desktop_file_utils_version 0.6
|
|
|
%define nspr_version 4.8
|
|
|
-%define nss_version 3.12.3.99
|
|
|
+%define nss_version 3.12.6
|
|
|
%define cairo_version 1.6.0
|
|
|
%define freetype_version 2.1.9
|
|
|
%define sqlite_version 3.6.14
|
|
|
@@ -96,8 +96,10 @@ Patch1020: firefox-2.0.0.3-visibility.patch
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
|
BuildRequires: pango-devel
|
|
|
BuildRequires: cairo-devel >= %{cairo_version}
|
|
|
+%if %{build_vineseed}
|
|
|
BuildRequires: nspr-devel >= %{nspr_version}
|
|
|
BuildRequires: nss-devel >= %{nss_version}
|
|
|
+%endif
|
|
|
BuildRequires: pixman-devel
|
|
|
BuildRequires: libpng-devel
|
|
|
BuildRequires: libjpeg-devel
|
|
|
@@ -105,7 +107,9 @@ BuildRequires: gtk2-devel
|
|
|
BuildRequires: zlib-devel, gzip, zip, unzip
|
|
|
BuildRequires: libIDL-devel
|
|
|
BuildRequires: freetype2-devel >= %{freetype_version}
|
|
|
-BuildRequires: libnotify-devel >= %{libnotify_version}
|
|
|
+## disabled libnotify support
|
|
|
+## see related bug: https://bugzilla.mozilla.org/show_bug.cgi?id=478463
|
|
|
+#BuildRequires: libnotify-devel >= %{libnotify_version}
|
|
|
BuildRequires: bzip2-devel
|
|
|
BuildRequires: gnome-vfs2-devel
|
|
|
BuildRequires: libgnome-devel
|
|
|
@@ -118,6 +122,7 @@ BuildRequires: hunspell-devel
|
|
|
BuildRequires: sqlite3-devel >= %{sqlite_version}
|
|
|
BuildRequires: startup-notification-devel
|
|
|
BuildRequires: desktop-file-utils
|
|
|
+BuildRequires: alsa-lib-devel
|
|
|
Requires: sqlite3 >= %{sqlite_version}
|
|
|
Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
|
|
|
Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
|
|
|
@@ -157,6 +162,9 @@ cd mozilla
|
|
|
|
|
|
cd -
|
|
|
%{__rm} -f .mozconfig
|
|
|
+%if %{build_vine5}
|
|
|
+%{__cp} %{SOURCE1030} .mozconfig
|
|
|
+%endif
|
|
|
%if %{build_vineseed}
|
|
|
%{__cp} %{SOURCE1040} .mozconfig
|
|
|
# cat not build with xulrunner (yet)
|
|
|
@@ -318,6 +326,12 @@ fi
|
|
|
#===============================================================================
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Jul 03 2010 Kazutaka HARADA <kazutaka@vinelinux.org> 3.1-2
|
|
|
+- add BuildRequires: alsa-lib-devel
|
|
|
+- remove BuildRequires: libnotify-devel
|
|
|
+ (workaround for known bug)
|
|
|
+- update mozconfig to add --disable-libnotify option
|
|
|
+
|
|
|
* Tue Jun 29 2010 Kazutaka HARADA <kazutaka@vinelinux.org> 3.1-1
|
|
|
- new upstream release
|
|
|
- update spec entirely
|
kazutaka