[thunderbird-lightning] Require nss-static only for fedora > 15 to make git merge possible

Jan Horak xhorak at fedoraproject.org
Mon Jul 18 12:19:03 UTC 2011


commit 429e53b9189569eafe5bda0d170bc1465cffba57
Author: Jan Horak <jhorak at redhat.com>
Date:   Mon Jul 18 14:18:41 2011 +0200

    Require nss-static only for fedora > 15 to make git merge possible

 thunderbird-lightning.spec |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index f95dd3c..334bcfd 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -42,7 +42,9 @@ Patch0:         thunderbird-version.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
+%if 0%{?fedora} > 15
 BuildRequires:  nss-static
+%endif
 BuildRequires:  cairo-devel >= %{cairo_version}
 BuildRequires:  libnotify-devel >= %{libnotify_version}
 BuildRequires:  libpng-devel
@@ -168,6 +170,9 @@ find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
 #===============================================================================
 
 %changelog
+* Mon Jul 18 2011 Jan Horak <jhorak at redhat.com> - 1.0-0.44.b3pre
+- Require nss-static only for Fedora 16+
+
 * Thu Jul 14 2011 Jan Horak <jhorak at redhat.com> - 1.0-0.43.b3pre
 - Update to thunderbird 5 source
 - Removed obsolete patches


More information about the scm-commits mailing list