rpms/sunbird/EL-5 sunbird.spec,1.6,1.7

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8190

Modified Files:
	sunbird.spec 
Log Message:
* Mon Nov 24 2008 Lubomir Rintel <lkundrak at v3.sk> 0.9-4
- Disable lightning on EL-5 ppc, since there's no Desktop with thunderbird
- Fix summary



Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/EL-5/sunbird.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sunbird.spec	27 Oct 2008 09:37:23 -0000	1.6
+++ sunbird.spec	24 Nov 2008 05:15:08 -0000	1.7
@@ -1,3 +1,10 @@
+%bcond_without lightning
+%ifarch ppc
+%if 0%{?rhel}
+%define with_lightning 0
+%endif
+%endif
+
 %define progdir %{_prefix}/%{_lib}/%{name}-%{version}
 %define docs LEGAL LICENSE README.txt
 %{?_with_official:%define official 1}
@@ -8,8 +15,8 @@
 
 Name:           sunbird
 Version:        0.9
-Release:        3%{?dist}
-Summary:        Mozilla Sunbird Calendar
+Release:        4%{?dist}
+Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -46,6 +53,9 @@
 Requires(post):  desktop-file-utils
 Requires(postun):  desktop-file-utils
 
+# There's no RHEL desktop for ppc, therefore no thunderbird
+ExcludeArch: ppc
+
 AutoProv: 0
 
 %description
@@ -53,6 +63,7 @@
 Mozilla Toolkit. Our goal is to bring Mozilla-style ease-of-use to your
 calendar, without tying you to a particular storage solution.
 
+%if %{with_lightning}
 %package -n thunderbird-lightning
 Summary:        The calendar extension to Thunderbird
 Group:          Applications/Productivity
@@ -77,6 +88,7 @@
   --basedir %{_libdir}                                          \\\
   --extpath %{_libdir}/thunderbird-lightning                    \\\
   --action 
+%endif
 
 
 %prep
@@ -124,7 +136,11 @@
 ac_add_options --enable-system-cairo
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
+%if %{with_lightning}
 ac_add_options --enable-extensions=default,lightning
+%else
+ac_add_options --enable-extensions=default
+%endif
 ac_add_options --disable-updater
 ac_add_options --disable-crashreporter
 EOF
@@ -163,8 +179,10 @@
   $RPM_BUILD_ROOT%{progdir}/js/calAlarmMonitor.js               \
   $RPM_BUILD_ROOT%{progdir}/js/calFreeBusyService.js
 
+%if %{with_lightning}
 # Avoid "Chrome Registration Failed" message on first startup and extension installation
 touch $RPM_BUILD_ROOT%{progdir}/extensions/%{lightning_extname}/chrome.manifest
+%endif
 
 # Icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
@@ -192,6 +210,7 @@
   mv lala $extensiondir/install.rdf
 done
 
+%if %{with_lightning}
 # Lightning
 unzip -qod $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning dist/xpi-stage/lightning.xpi
 install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/mozilla-extension-update.sh
@@ -208,6 +227,7 @@
   sed -n '/en-US/n;s/\(\([^-]*\)-\(.*\)\.jar\)/locale \2 \3 jar:chrome\/\1!\/locale\/\3\/\2\//p' \
   >> $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/chrome.manifest
 # ^^^ I'm going to burn in hell for this ^^^
+%endif
 
 
 %clean
@@ -230,6 +250,7 @@
 fi
 
 
+%if %{with_lightning}
 %post -n thunderbird-lightning
 %{tbupdate_lightning} install ||Â :
 
@@ -260,6 +281,7 @@
 if [ $1 != 0 ]; then
   %{tbupdate_lightning} install ||Â :
 fi
+%endif
 
 
 %files
@@ -271,12 +293,18 @@
 %{_datadir}/icons/hicolor/128x128/apps/sunbird.png
 
 
+%if %{with_lightning}
 %files -n thunderbird-lightning
 %defattr(-,root,root,-)
 %{_libdir}/thunderbird-lightning
+%endif
 
 
 %changelog
+* Mon Nov 24 2008 Lubomir Rintel <lkundrak at v3.sk> 0.9-4
+- Disable lightning on EL-5 ppc, since there's no Desktop with thunderbird
+- Fix summary
+
 * Thu Oct 2 2008 Lubomir Rintel <lkundrak at v3.sk> 0.9-3
 - Attempt to fix the libical patch's timezone problem