packages: icedove/icedove.spec - use builddir outside sourcedir

[glen]

Author: glen                         Date: Tue Aug 24 21:33:59 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use builddir outside sourcedir

---- Files affected:
packages/icedove:
   icedove.spec (1.97 -> 1.98) 

---- Diffs:

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.97 packages/icedove/icedove.spec:1.98
--- packages/icedove/icedove.spec:1.97	Tue Aug 24 23:09:39 2010
+++ packages/icedove/icedove.spec	Tue Aug 24 23:33:54 2010
@@ -113,6 +113,9 @@
 # and as we don't provide them, don't require either
 %define		_noautoreq		libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so
 
+%define		topdir		%{_builddir}/%{name}-%{version}
+%define		objdir		%{topdir}/obj-%{_target_cpu}
+
 %description
 Icedove is an open-source,fast and portable email client.
 
@@ -200,7 +203,7 @@
 ln -snf %{_libdir}/xulrunner-sdk libxul-sdk/sdk
 
 cat << EOF > .mozconfig
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu}
+mk_add_options MOZ_OBJDIR=%{objdir}
 
 export CFLAGS="%{rpmcflags}"
 export CXXFLAGS="%{rpmcflags}"
@@ -322,10 +325,9 @@
 %endif
 
 %if %{with enigmail}
-top=$(pwd)
 cd mailnews/extensions/enigmail
-./makemake -r -o $top/obj-%{_target_cpu}
-%{__make} -C $top/obj-%{_target_cpu}/mailnews/extensions/enigmail \
+./makemake -r -o %{objdir}
+%{__make} -C %{objdir}/mailnews/extensions/enigmail \
 	STRIP="/bin/true" \
 	CC="%{__cc}" \
 	CXX="%{__cxx}"
@@ -335,7 +337,7 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name},%{_datadir}/%{name},%{_pixmapsdir},%{_desktopdir}}
 
-cd mozilla/obj-%{_target_cpu}
+cd %{objdir}
 %{__make} -C mail/installer stage-package \
 	DESTDIR=$RPM_BUILD_ROOT \
 	MOZ_PKG_APPDIR=%{_libdir}/%{name} \
@@ -377,7 +379,7 @@
 ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/mozilla-thunderbird
 
 cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
-cp -a ../icedove/branding/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+cp -a %{topdir}/mozilla/icedove/branding/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 
 # files created by regxpcom -register
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat
@@ -395,8 +397,8 @@
 cp -rfLp components/ipc.xpt $ext_dir/components
 cp -rfLp defaults/preferences/enigmail.js $ext_dir/defaults/preferences
 cd -
-cp -a ../mailnews/extensions/enigmail/package/install.rdf $ext_dir
-cp -a ../mailnews/extensions/enigmail/package/chrome.manifest $ext_dir/chrome.manifest
+cp -a %{topdir}/mozilla/mailnews/extensions/enigmail/package/install.rdf $ext_dir
+cp -a %{topdir}/mozilla/mailnews/extensions/enigmail/package/chrome.manifest $ext_dir/chrome.manifest
 %endif
 
 # remove unecessary stuff
@@ -519,6 +521,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.98  2010/08/24 21:33:54  glen
+- use builddir outside sourcedir
+
 Revision 1.97  2010/08/24 21:09:39  glen
 - BR: alsa-lib-devel, bzip2-devel, libiw-devel, libnotify-devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove.spec?r1=1.97&r2=1.98&f=u