Attachment 241791 Details for Bug 237137 – Patch to enable building lightning together with thunderbird

[patch] Patch to enable building lightning together with thunderbird

thunderbird-buildlightning.patch (text/plain), 5.36 KB, created by David Fraser on 2007-10-29 12:55:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Fraser

Created: 2007-10-29 12:55:21 UTC

Size: 5.36 KB

patch

obsolete

>--- thunderbird-2.0.0.5-2.fc7.spec	2007-07-27 14:50:19.000000000 +0200
>+++ thunderbird.spec	2007-10-29 14:24:22.000000000 +0200
>@@ -3,12 +3,15 @@
> %define nss_version 3.10
> %define cairo_version 1.0
> 
>+%define thunderbird_version 2.0.0.5
>+%define lightning_version 0.7
>+
> %define official_branding 1
> 
> Summary:	Mozilla Thunderbird mail/newsgroup client
> Name:		thunderbird
>-Version:	2.0.0.5
>-Release:	2%{?dist}
>+Version:	%{thunderbird_version}
>+Release:	3%{?dist}
> URL:		http://www.mozilla.org/projects/thunderbird/
> License:	MPL
> Group:		Applications/Internet
>@@ -26,8 +29,13 @@
> Source21:       thunderbird.sh.in
> Source22:       thunderbird.png
> Source30:       thunderbird-open-browser.sh
>+# tarball created by download lightning from CVS, co -r SUNBIRD_0_7_RELEASE mozilla/calendar/
>+Source40:	http://davidf.sjsoft.com/files/lightning-%{lightning_version}-source.tar.bz2
>+Source41:       thunderbird-mozconfig-lightning
> Source100:      find-external-requires
> 
>+
>+
> # Build patches
> Patch1:         firefox-2.0-link-layout.patch
> Patch2:         firefox-1.0-prdtoa.patch
>@@ -94,7 +102,7 @@
> Requires:	desktop-file-utils >= %{desktop_file_utils_version}
> Obsoletes:	MozillaThunderbird
> 
>-%define mozappdir %{_libdir}/thunderbird-%{version}
>+%define mozappdir %{_libdir}/thunderbird-%{thunderbird_version}
> 
> AutoProv: 0
> %define _use_internal_dependency_generator 0
>@@ -107,6 +115,8 @@
> 
> %prep
> %setup -q -n mozilla
>+# unpack the calendar source
>+%setup -q -D -T -b40 -n mozilla
> %patch1 -p1 -b .link-layout
> %patch2 -p0
> #%patch4 -p1
>@@ -160,6 +170,8 @@
> %if %{official_branding}
> %{__cat} %{SOURCE11} >> .mozconfig
> %endif
>+# add lightning
>+%{__cat} %{SOURCE41} >> .mozconfig
> 
> #===============================================================================
> 
>@@ -234,10 +246,13 @@
> # Install langpacks
> %{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/extensions
> %{__tar} xjf %{SOURCE1}
>+# to avoid packaging any other extensions, we list the langpacks
>+%{__rm} -f thunderbird-langpacks.list
> for langpack in `ls thunderbird-langpacks/*.xpi`; do
>   language=`basename $langpack .xpi`
>   extensiondir=$RPM_BUILD_ROOT%{mozappdir}/extensions/langpack-$language@thunderbird.mozilla.org
>   %{__mkdir_p} $extensiondir
>+  echo %{mozappdir}/extensions/langpack-$language@thunderbird.mozilla.org >> thunderbird-langpacks.list
>   unzip $langpack -d $extensiondir
>   find $extensiondir -type f | xargs chmod 644
> 
>@@ -265,6 +280,11 @@
> touch $RPM_BUILD_ROOT%{mozappdir}/components/compreg.dat
> touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
> 
>+# autoextract the lightning extension ID - this could be hardcoded here
>+lightning_id="`unzip -p dist/xpi-stage/lightning.xpi install.rdf | grep -B1 '<em:name>Lightning' | grep '<em:id>' | sed 's#^.*<em:id>$.*$</em:id>.*$#\1#'`"
>+unzip -d $RPM_BUILD_ROOT%{mozappdir}/extensions/"$lightning_id" dist/xpi-stage/lightning.xpi
>+# because its hard to track $lightning_id in the files section, we use a file list (just containing the directory)
>+echo %{mozappdir}/extensions/"$lightning_id" > lightning-files.list
> 
> %clean
> %{__rm} -rf $RPM_BUILD_ROOT
>@@ -276,7 +296,7 @@
> update-desktop-database %{_datadir}/applications
> 
> 
>-%files
>+%files -f thunderbird-langpacks.list
> %defattr(-,root,root,-)
> %attr(755,root,root) %{_bindir}/thunderbird
> %attr(644,root,root) %{_datadir}/applications/mozilla-thunderbird.desktop
>@@ -286,7 +306,9 @@
> %{mozappdir}/components
> %{mozappdir}/defaults
> %{mozappdir}/dictionaries
>-%{mozappdir}/extensions
>+%dir %{mozappdir}/extensions
>+# default theme
>+%{mozappdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
> %{mozappdir}/greprefs
> %{mozappdir}/icons
> %{mozappdir}/init.d
>@@ -309,10 +331,45 @@
> %exclude %{mozappdir}/xpt_dump
> %exclude %{mozappdir}/xpt_link
> %exclude %{mozappdir}/xpicleanup
>+# lightning installs into /js etc but we want it in an extension
>+%exclude %{mozappdir}/js
>+%exclude %{mozappdir}/chrome/calendar*.jar
>+%exclude %{mozappdir}/chrome/calendar.manifest
>+%exclude %{mozappdir}/chrome/lightning*.jar
>+%exclude %{mozappdir}/components/cal*.js
>+%exclude %{mozappdir}/components/cal*.xpt
>+%exclude %{mozappdir}/components/imgicon.xpt
>+%exclude %{mozappdir}/components/libcalbasecomps.so
>+%exclude %{mozappdir}/components/libimgicon.so
>+%exclude %{mozappdir}/components/libmozgnome.so
>+%exclude %{mozappdir}/components/libwebdav.so
>+%exclude %{mozappdir}/components/lightning*.js
>+%exclude %{mozappdir}/components/wcap.xpt
>+%exclude %{mozappdir}/components/webdav.xpt
>+%exclude %{mozappdir}/defaults/preferences/lightning.js
>+%exclude %{mozappdir}/defaults/preferences/wcap-enabler.js
>+
>+%package lightning
>+Summary:	Mozilla Lightning calendaring extension for Mozilla Thunderbird
>+Version:	%{lightning_version}
>+Group:		Applications/Internet
>+Release:	1%{?dist}
>+URL:		http://www.mozilla.org/projects/calendar/lightning/
>+License:	MPL
>+Requires:	thunderbird = %{thunderbird_version}
>+
>+%description lightning
>+Lightning brings the Sunbird calendar to the popular email client, Mozilla Thunderbird. Since it's an extension, Lightning is tightly integrated with Thunderbird, allowing it to easily perform email-related calendaring tasks.
>+
>+%files lightning -f lightning-files.list
>+%defattr(-,root,root,-)
> 
> #===============================================================================
> 
> %changelog
>+* Fri Oct 26 2007 David Fraser <davidf@sjsoft.com> 2.0.0.5-3
>+- hack to add lightning
>+
> * Wed Jul 25 2007 Martin Stransky <stransky@redhat.com> 2.0.0.5-2
> - added ligature pango fix
>

Actions: View | Diff

Attachments on bug 237137: 241791 | 241801 | 241811