[sunbird] Disable build of thunderbird-lightning extension

Jan Horak xhorak at fedoraproject.org
Wed Nov 3 09:57:51 UTC 2010


commit 9c23c0d49dbefd0dd2dacb3203701bd938c5f758
Author: Jan Horak <jhorak at redhat.com>
Date:   Wed Nov 3 10:57:43 2010 +0100

    Disable build of thunderbird-lightning extension

 sunbird.spec |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/sunbird.spec b/sunbird.spec
index 20c5395..29f5812 100644
--- a/sunbird.spec
+++ b/sunbird.spec
@@ -4,6 +4,7 @@
 %define with_lightning %{nil}
 %endif
 %endif
+%define with_lightning 0
 
 %define version_internal 1.0b2
 %define progdir %{_libdir}/%{name}-%{version_internal}pre
@@ -18,7 +19,7 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.32.b2pre%{?dist}
+Release:        0.33.b2pre%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
@@ -77,7 +78,7 @@ Mozilla Toolkit. It brings Mozilla-style ease-of-use to your
 calendar, without tying you to a particular storage solution.
 
 
-%if %with lightning
+%if %{with_lightning}
 %package -n thunderbird-lightning
 Summary:        The calendar extension to Thunderbird
 Group:          Applications/Productivity
@@ -180,7 +181,7 @@ touch $RPM_BUILD_ROOT%{progdir}/extensions/%{gdata_extname}/chrome.manifest
 unzip -qod $RPM_BUILD_ROOT%{progdir}/extensions/%{gdata_extname} \
         mozilla/dist/xpi-stage/gdata-provider.xpi
 
-%if %with lightning
+%if %{with_lightning}
 # Avoid "Chrome Registration Failed" message on first startup and extension installation
 mkdir -p $RPM_BUILD_ROOT%{lightning_extname}
 touch $RPM_BUILD_ROOT%{lightning_extname}/chrome.manifest
@@ -236,7 +237,7 @@ fi
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/128x128/apps/sunbird.png
 
-%if %with lightning
+%if %{with_lightning}
 %files -n thunderbird-lightning
 %doc mozilla/LEGAL mozilla/LICENSE mozilla/README.txt
 %defattr(-,root,root,-)
@@ -246,6 +247,9 @@ fi
 
 
 %changelog
+* Tue Nov  2 2010 Jan Horak <jhorak at redhat.com> - 1.0-0.33.b2pre
+- Disable thunderbird-lightning extension
+
 * Mon Nov  1 2010 Jan Horak <jhorak at redhat.com> - 1.0-0.32.b2pre
 - The thunderbird-lightning extension moved to thunderbird package
 - Building sunbird without thunderbird-lightning


More information about the scm-commits mailing list