[thunderbird-lightning] Fix moz_objdir in spec
Orion Poplawski
orion at fedoraproject.org
Sun Dec 15 05:21:27 UTC 2013
commit cd0017458d7407c4eb695a10765daf9e78a4de44
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Sat Dec 14 22:21:32 2013 -0700
Fix moz_objdir in spec
thunderbird-lightning.spec | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index bec3663..00ee07f 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -14,7 +14,7 @@
# Compatible versions are listed in:
# comm-release/calendar/lightning/install.rdf.rej
# comm-release/calendar/providers/gdata/install.rdf.rej
-%global moz_objdir objdir-tb
+%global moz_objdir objdir
%global lightning_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{e2fda1a4-762b-4020-b5ad-a41df1933103}
%global gdata_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}
@@ -182,7 +182,7 @@ export MAKE="gmake %{moz_make_flags}"
make -f client.mk build STRIP=/bin/true
# Package l10n files
-cd objdir-tb/calendar/lightning
+cd %{moz_objdir}/calendar/lightning
#make AB_CD=all L10N_XPI_NAME=lightning-all repack-clobber-all
make AB_CD=all L10N_XPI_NAME=lightning-all repack-stage-all
grep -v 'osx' ../../../calendar/locales/shipped-locales | while read lang x
@@ -205,8 +205,8 @@ 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%{lightning_extname} objdir-tb/mozilla/dist/xpi-stage/lightning-%{lightning_version}.all.linux-*.xpi
-unzip -qod $RPM_BUILD_ROOT%{gdata_extname} objdir-tb/mozilla/dist/xpi-stage/gdata-provider-0.25.en-US.linux-*.xpi
+unzip -qod $RPM_BUILD_ROOT%{lightning_extname} %{moz_objdir}/mozilla/dist/xpi-stage/lightning-%{lightning_version}.all.linux-*.xpi
+unzip -qod $RPM_BUILD_ROOT%{gdata_extname} %{moz_objdir}/mozilla/dist/xpi-stage/gdata-provider-0.25.en-US.linux-*.xpi
# Fix up permissions
find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
More information about the scm-commits
mailing list