rpms/thunderbird
7
0
Fork 0
Code Issues Pull Requests Releases Activity

added system nss switch

Browse Source
This commit is contained in:
Martin Stransky 2012-10-09 12:50:00 +02:00
parent aed4f21f4b
commit 1b7ab3e92c
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thunderbird-mozconfig
View File

@ -7,8 +7,6 @@ mk_add_options AUTOCONF=autoconf-2.13
ac_add_options --prefix="$PREFIX" ac_add_options --prefix="$PREFIX"
ac_add_options --libdir="$LIBDIR" ac_add_options --libdir="$LIBDIR"
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
ac_add_options --with-system-jpeg ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib ac_add_options --with-system-zlib
ac_add_options --with-system-libvpx ac_add_options --with-system-libvpx

24
thunderbird.spec
View File

@ -1,3 +1,6 @@
# Use system nspr/nss?
%define system_nss 1
# Build as a debug package? # Build as a debug package?
%define debug_build 0 %define debug_build 0
@ -9,11 +12,15 @@
%define build_langpacks 1 %define build_langpacks 1
%if %{?system_nss}
%define nspr_version 4.9 %define nspr_version 4.9
%define nss_version 3.13.3 %define nss_version 3.13.3
%endif
%define cairo_version 1.8.8 %define cairo_version 1.8.8
%define freetype_version 2.1.9 %define freetype_version 2.1.9
%if %{?system_sqlite}
%define sqlite_version 3.7.10 %define sqlite_version 3.7.10
%endif
%define libnotify_version 0.4 %define libnotify_version 0.4
%global libvpx_version 1.0.0 %global libvpx_version 1.0.0
%define _default_patch_fuzz 2 %define _default_patch_fuzz 2
@ -78,9 +85,11 @@ Patch301: rhbz-855923.patch
%endif %endif
BuildRequires: nss-static %if %{?system_nss}
BuildRequires: nss-static >= %{nss_version}
BuildRequires: nspr-devel >= %{nspr_version} BuildRequires: nspr-devel >= %{nspr_version}
BuildRequires: nss-devel >= %{nss_version} BuildRequires: nss-devel >= %{nss_version}
%endif
BuildRequires: cairo-devel >= %{cairo_version} BuildRequires: cairo-devel >= %{cairo_version}
BuildRequires: libnotify-devel >= %{libnotify_version} BuildRequires: libnotify-devel >= %{libnotify_version}
BuildRequires: libpng-devel BuildRequires: libpng-devel
@ -110,8 +119,10 @@ BuildRequires: libcurl-devel
BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGL-devel
BuildRequires: libvpx-devel >= %{libvpx_version} BuildRequires: libvpx-devel >= %{libvpx_version}
Requires: mozilla-filesystem Requires: mozilla-filesystem
%if %{?system_nss}
Requires: nspr >= %{nspr_version} Requires: nspr >= %{nspr_version}
Requires: nss >= %{nss_version} Requires: nss >= %{nss_version}
%endif
%if %{?system_sqlite} %if %{?system_sqlite}
Requires: sqlite >= %{sqlite_version} Requires: sqlite >= %{sqlite_version}
%endif %endif
@ -176,6 +187,14 @@ cd ..
%{__cat} %{SOURCE13} >> .mozconfig %{__cat} %{SOURCE13} >> .mozconfig
%endif %endif
%if %{?system_nss}
echo "ac_add_options --with-system-nspr" >> .mozconfig
echo "ac_add_options --with-system-nss" >> .mozconfig
%else
echo "ac_add_options --without-system-nspr" >> .mozconfig
echo "ac_add_options --without-system-nss" >> .mozconfig
%endif
# s390(x) fails to start with jemalloc enabled # s390(x) fails to start with jemalloc enabled
%ifarch s390 s390x %ifarch s390 s390x
echo "ac_add_options --disable-jemalloc" >> .mozconfig echo "ac_add_options --disable-jemalloc" >> .mozconfig
@ -393,6 +412,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{mozappdir}/crashreporter.ini %{mozappdir}/crashreporter.ini
%{mozappdir}/Throbber-small.gif %{mozappdir}/Throbber-small.gif
%endif %endif
%if !%{?system_nss}
%{mozappdir}/*.chk
%endif
%exclude %{_datadir}/idl/%{name}-%{version} %exclude %{_datadir}/idl/%{name}-%{version}
%exclude %{_includedir}/%{name}-%{version} %exclude %{_includedir}/%{name}-%{version}
%{mozappdir}/chrome.manifest %{mozappdir}/chrome.manifest