[sunbird/f13/master] Removed thunderbird-lightning, moved to thunderbird package

Jan Horak xhorak at fedoraproject.org
Wed Nov 3 13:58:36 UTC 2010


commit 9c428e915355c52dbfefb26f0c1842e5bfcd0bc0
Author: Jan Horak <jhorak at redhat.com>
Date:   Wed Nov 3 14:58:20 2010 +0100

    Removed thunderbird-lightning, moved to thunderbird package

 sunbird.spec |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/sunbird.spec b/sunbird.spec
index 9bd8622..0dd7225 100644
--- a/sunbird.spec
+++ b/sunbird.spec
@@ -1,11 +1,12 @@
-%bcond_without lightning
+#%bcond_without lightning
 %ifarch ppc
 %if 0%{?rhel}
 %define with_lightning %{nil}
 %endif
 %endif
+%define with_lightning 0
 
-%define version_internal 1.0b2
+%define version_internal 1.0b3
 %define progdir %{_libdir}/%{name}-%{version_internal}pre
 %define thunderbird_version 3.1.6
 %define libnotify_version 0.4
@@ -18,7 +19,7 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.30.b2pre%{?dist}
+Release:        0.31.b3pre%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
@@ -72,7 +73,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
@@ -171,7 +172,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
@@ -227,7 +228,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,-)
@@ -236,6 +237,10 @@ fi
 %endif
 
 %changelog
+* Wed Nov  3 2010 Jan Horak <jhorak at redhat.com> - 1.0-0.31.b3pre
+- Disable thunderbird-lightning extension
+- The thunderbird-lightning extension moved to thunderbird package
+
 * Thu Oct 28 2010 Jan Horak <jhorak at redhat.com> - 1.0-0.30.b2pre
 - Rebuild against Thunderbird 3.1.6
 


More information about the scm-commits mailing list