rpms/sunbird/F-13 .cvsignore, 1.25, 1.26 sources, 1.26, 1.27 sunbird.spec, 1.58, 1.59 mozilla-extension-update.sh, 1.1, NONE
Jan Horak
xhorak at fedoraproject.org
Wed Jul 21 10:33:06 UTC 2010
Author: xhorak
Update of /cvs/pkgs/rpms/sunbird/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10063
Modified Files:
.cvsignore sources sunbird.spec
Removed Files:
mozilla-extension-update.sh
Log Message:
Update due to TB 3.1.1, changed install location of thunderbird-lightning
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-13/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore 24 Jun 2010 14:22:38 -0000 1.25
+++ .cvsignore 21 Jul 2010 10:33:06 -0000 1.26
@@ -9,3 +9,4 @@ thunderbird-3.0.3.source.tar.bz2
thunderbird-3.0.5.source.tar.bz2
thunderbird-3.1rc2.source.tar.bz2
thunderbird-3.1.source.tar.bz2
+thunderbird-3.1.1.source.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-13/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources 24 Jun 2010 14:22:38 -0000 1.26
+++ sources 21 Jul 2010 10:33:06 -0000 1.27
@@ -1,2 +1,2 @@
6124cea0a433c6f005ff6789cf0f495f sunbird-l10n.tar
-feb4d737d568066076879a09bd0d506e thunderbird-3.1.source.tar.bz2
+3a8479252bb9a0c534870896fc10e2ff thunderbird-3.1.1.source.tar.bz2
Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-13/sunbird.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sunbird.spec 24 Jun 2010 14:22:38 -0000 1.58
+++ sunbird.spec 21 Jul 2010 10:33:06 -0000 1.59
@@ -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.1
%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
@@ -27,7 +29,6 @@ Source0: thunderbird-%{thunderbir
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 exten
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}/ext
%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
%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
%{_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
%{_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,19 @@ 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
+* Tue Jul 20 2010 Jan Horak <jhorak at redhat.com> - 1.0-0.26.b2pre
+- Changed thunderbird-lightning install location to /usr/lib/mozilla/extensions/{355...
+- Rebuild against Thunderbird 3.1.1
+
* Thu Jun 24 2010 Jan Horak <jhorak at redhat.com> - 1.0-0.25.b2pre
- Rebuild against Thunderbird 3.1
--- mozilla-extension-update.sh DELETED ---
More information about the scm-commits
mailing list