[sunbird/f14/master] Rebuild due to TB Update to 3.1.3
Jan Horak
xhorak at fedoraproject.org
Wed Sep 8 10:32:38 UTC 2010
commit 655249ffe99bcaaaba493ded301a200927e82f3e
Author: Jan Horak <jhorak at redhat.com>
Date: Wed Sep 8 12:32:42 2010 +0200
Rebuild due to TB Update to 3.1.3
.gitignore | 1 +
mozilla-extension-update.sh | 144 -------------------------------------------
sources | 2 +-
sunbird.spec | 97 ++++++-----------------------
4 files changed, 22 insertions(+), 222 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0bd4f56..45da034 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ thunderbird-3.0.2.source.tar.bz2
thunderbird-3.0.3.source.tar.bz2
thunderbird-3.1rc2.source.tar.bz2
thunderbird-3.1.source.tar.bz2
+/thunderbird-3.1.3.source.tar.bz2
diff --git a/sources b/sources
index 38d43c2..326b954 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
1d7d4eb4aaea7e7fae9eba3dcc995161 sunbird-l10n.tar
-feb4d737d568066076879a09bd0d506e thunderbird-3.1.source.tar.bz2
+46332e1d9a658f6e31797035107b1a8d thunderbird-3.1.3.source.tar.bz2
diff --git a/sunbird.spec b/sunbird.spec
index fc3deed..0acdb64 100644
--- a/sunbird.spec
+++ b/sunbird.spec
@@ -7,8 +7,10 @@
%define version_internal 1.0b2
%define progdir %{_libdir}/%{name}-%{version_internal}pre
-%define thunderbird_version 3.1
+%define thunderbird_version 3.1.3
%define libnotify_version 0.4
+%define lightning_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{e2fda1a4-762b-4020-b5ad-a41df1933103}
+%define gdata_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}
# This is to filter unwanted provides, that should be provided only by gecko-devel
%define _use_internal_dependency_generator 0
@@ -16,7 +18,7 @@
Name: sunbird
Version: 1.0
-Release: 0.25.b2pre%{?dist}
+Release: 0.28.b2pre%{?dist}
Summary: Calendar application built upon Mozilla toolkit
Group: Applications/Productivity
@@ -27,7 +29,6 @@ Source0: thunderbird-%{thunderbird_version}.source.tar.bz2
Source1: sunbird.desktop
Source2: sunbird-l10n.tar
#sunbird-langpacks-0.9.tar.gz
-Source3: mozilla-extension-update.sh
# This is used just for langpacks.
# TODO: build them!
#Source4: http://releases.mozilla.org/pub/mozilla.org/calendar/lightning/releases/0.9/lightning-0.9.linux-i686.xpi
@@ -86,26 +87,8 @@ Mozilla Thunderbird. Since it's an extension, Lightning is tightly
integrated with Thunderbird, allowing it to easily perform email-related
calendaring tasks.
-%define lightning_extname '{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-%define tbupdate_lightning \\\
- %{_libdir}/thunderbird-lightning/mozilla-extension-update.sh \\\
- --appname thunderbird \\\
- --extname %{lightning_extname} \\\
- --basedir %{_libdir} \\\
- --extpath %{_libdir}/thunderbird-lightning \\\
- --action
-
-%define gdata_extname '{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
-%define tbupdate_gdata \\\
- %{_libdir}/thunderbird-lightning/mozilla-extension-update.sh \\\
- --appname thunderbird \\\
- --extname %{gdata_extname} \\\
- --basedir %{_libdir} \\\
- --extpath %{_libdir}/thunderbird-lightning-gdata \\\
- --action
%endif
-
%prep
%setup -n comm-1.9.2 -q -a 2
%patch0 -p0 -b .jemalloc
@@ -115,7 +98,6 @@ calendaring tasks.
find . -name '*.cpp' -o -name '*.h' |xargs chmod -x
-
%build
cat >.mozconfig <<EOF
ac_add_options --disable-crashreporter
@@ -147,7 +129,6 @@ EOF
make -f client.mk build
-
%install
rm -rf $RPM_BUILD_ROOT
@@ -192,25 +173,26 @@ unzip -qod $RPM_BUILD_ROOT%{progdir}/extensions/%{gdata_extname} \
%if %with lightning
# Avoid "Chrome Registration Failed" message on first startup and extension installation
-touch $RPM_BUILD_ROOT%{progdir}/extensions/%{lightning_extname}/chrome.manifest
-touch $RPM_BUILD_ROOT%{progdir}/extensions/%{gdata_extname}/chrome.manifest
+mkdir -p $RPM_BUILD_ROOT%{lightning_extname}
+touch $RPM_BUILD_ROOT%{lightning_extname}/chrome.manifest
+mkdir -p $RPM_BUILD_ROOT%{gdata_extname}
+touch $RPM_BUILD_ROOT%{gdata_extname}/chrome.manifest
# Lightning and GData provider for it
-unzip -qod $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning mozilla/dist/xpi-stage/lightning.xpi
-unzip -qod $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning-gdata mozilla/dist/xpi-stage/gdata-provider.xpi
-install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/mozilla-extension-update.sh
+unzip -qod $RPM_BUILD_ROOT%{lightning_extname} mozilla/dist/xpi-stage/lightning.xpi
+unzip -qod $RPM_BUILD_ROOT%{gdata_extname} mozilla/dist/xpi-stage/gdata-provider.xpi
# No langpacks for preview release
%if 0
# Unpack lightning language packs, except en_US
unzip -l %{SOURCE4} '*.jar' |
awk '/-[^\/]*\.jar/ && !/en-US/ {print $4}' |
- xargs unzip -qod $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning %{SOURCE4}
+ xargs unzip -qod $RPM_BUILD_ROOT%{mozilla_extensions_dir}/thunderbird-lightning %{SOURCE4}
# Register them
-ls $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/chrome |
+ls $RPM_BUILD_ROOT%{mozilla_extensions_dir}/thunderbird-lightning/chrome |
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
+ >>$RPM_BUILD_ROOT%{mozilla_extensions_dir}/thunderbird-lightning/chrome.manifest
# ^^^ I'm going to burn in hell for this ^^^
%endif
%endif
@@ -223,7 +205,6 @@ find $RPM_BUILD_ROOT -name '*.so' |xargs chmod 0755
%clean
rm -rf $RPM_BUILD_ROOT
-
%post
update-desktop-database %{_datadir}/applications
touch --no-create %{_datadir}/icons/hicolor
@@ -231,7 +212,6 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
-
%postun
update-desktop-database %{_datadir}/applications
touch --no-create %{_datadir}/icons/hicolor
@@ -239,47 +219,6 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
-
-%if %with lightning
-%post -n thunderbird-lightning
-%{tbupdate_lightning} install || :
-%{tbupdate_gdata} install || :
-
-
-%preun -n thunderbird-lightning
-if [ $1 = 0 ]; then
- %{tbupdate_lightning} remove || :
- %{tbupdate_gdata} remove || :
-fi
-
-
-%postun -n thunderbird-lightning
-# This is needed not to reverse the effect of our preun, which
-# is guarded against upgrade, but because of our triggerun,
-# which is run on self-upgrade, though triggerpostun isn't
-if [ $1 != 0 ]; then
- %{tbupdate_lightning} install || :
- %{tbupdate_gdata} install || :
-fi
-
-%triggerin -n thunderbird-lightning -- thunderbird
-%{tbupdate_lightning} install || :
-%{tbupdate_gdata} install || :
-
-%triggerun -n thunderbird-lightning -- thunderbird
-%{tbupdate_lightning} remove || :
-%{tbupdate_gdata} remove || :
-
-%triggerpostun -n thunderbird-lightning -- thunderbird
-# Guard against being run post-self-uninstall, even though that
-# doesn't happen currently (see comment above)
-if [ $1 != 0 ]; then
- %{tbupdate_lightning} install || :
- %{tbupdate_gdata} install || :
-fi
-%endif
-
-
%files
%defattr(-,root,root,-)
%doc mozilla/LEGAL mozilla/LICENSE mozilla/README.txt
@@ -288,17 +227,21 @@ fi
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/128x128/apps/sunbird.png
-
%if %with lightning
%files -n thunderbird-lightning
%doc mozilla/LEGAL mozilla/LICENSE mozilla/README.txt
%defattr(-,root,root,-)
-%{_libdir}/thunderbird-lightning
-%{_libdir}/thunderbird-lightning-gdata
+%{lightning_extname}
+%{gdata_extname}
%endif
%changelog
+* Wed Sep 8 2010 Jan Horak <jhorak at redhat.com> - 1.0-0.28.b2pre
+- Changed thunderbird-lightning install location to /usr/lib/mozilla/extensions/{355...
+- Rebuild against Thunderbird 3.1.3
+- Bump version above F13
+
* Thu Jun 24 2010 Jan Horak <jhorak at redhat.com> - 1.0-0.25.b2pre
- Rebuild against Thunderbird 3.1
More information about the scm-commits
mailing list