Author: baggins Date: Wed Jun 20 12:56:46 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 2 - package enigmail properly
---- Files affected: packages/icedove: icedove.spec (1.165 -> 1.166) ---- Diffs: ================================================================ Index: packages/icedove/icedove.spec diff -u packages/icedove/icedove.spec:1.165 packages/icedove/icedove.spec:1.166 --- packages/icedove/icedove.spec:1.165 Tue Jun 19 20:03:47 2012 +++ packages/icedove/icedove.spec Wed Jun 20 14:56:41 2012 @@ -35,7 +35,7 @@ Summary(pl.UTF-8): Icedove - klient poczty Name: icedove Version: 13.0.1 -Release: 1 +Release: 2 License: MPL 1.1 or GPL v2+ or LGPL v2.1+ Group: X11/Applications/Networking Source0: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2 @@ -333,6 +333,11 @@ STRIP="/bin/true" \ CC="%{__cc}" \ CXX="%{__cxx}" + +%{__make} -C %{objdir}/mailnews/extensions/enigmail xpi \ + STRIP="/bin/true" \ + CC="%{__cc}" \ + CXX="%{__cxx}" %endif %install @@ -421,15 +426,16 @@ %if %{with enigmail} ext_dir=$RPM_BUILD_ROOT%{_libdir}/%{name}/extensions/\{847b3a00-7ab1-11d4-8f02-006008948af5\} -install -d $ext_dir/{chrome,components,defaults/preferences} +install -d $ext_dir/{chrome,components,defaults/preferences,modules} cd mozilla/dist/bin -#cp -rfLp chrome/enigmail.jar $ext_dir/chrome -#cp -rfLp chrome/enigmime.jar $ext_dir/chrome +cp -rfLp chrome/enigmail.jar $ext_dir/chrome cp -rfLp components/enig* $ext_dir/components cp -rfLp components/libenigmime.so $ext_dir/components cp -rfLp components/libipc.so $ext_dir/components cp -rfLp components/ipc.xpt $ext_dir/components cp -rfLp defaults/preferences/enigmail.js $ext_dir/defaults/preferences +cp -rfLp modules/{commonFuncs,enigmailCommon,keyManagement,pipeConsole,pipeTransport,subprocess}.jsm $ext_dir/modules +cp -rfLp modules/{subprocess_worker_unix,subprocess_worker_win}.js $ext_dir/modules cd - cp -p %{topdir}/mozilla/mailnews/extensions/enigmail/package/install.rdf $ext_dir cp -p %{topdir}/mozilla/mailnews/extensions/enigmail/package/chrome.manifest $ext_dir/chrome.manifest @@ -515,6 +521,16 @@ %{_datadir}/%{name}/extensions %{_datadir}/%{name}/isp %{_datadir}/%{name}/modules +%if %{with enigmail} +%exclude %{_datadir}/%{name}/modules/commonFuncs.jsm +%exclude %{_datadir}/%{name}/modules/enigmailCommon.jsm +%exclude %{_datadir}/%{name}/modules/keyManagement.jsm +%exclude %{_datadir}/%{name}/modules/pipeConsole.jsm +%exclude %{_datadir}/%{name}/modules/pipeTransport.jsm +%exclude %{_datadir}/%{name}/modules/subprocess.jsm +%exclude %{_datadir}/%{name}/modules/subprocess_worker_unix.js +%exclude %{_datadir}/%{name}/modules/subprocess_worker_win.js +%endif %{_datadir}/%{name}/searchplugins %if %{without xulrunner} %{_datadir}/%{name}/res @@ -565,6 +581,9 @@ %attr(755,root,root) %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/*.so %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/*.xpt %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/*.js +%dir %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules +%{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/*.jsm +%{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/*.js %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -573,6 +592,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.166 2012/06/20 12:56:41 baggins +- rel 2 +- package enigmail properly + Revision 1.165 2012/06/19 18:03:47 baggins - rel 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/icedove/icedove.spec?r1=1.165&r2=1.166 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit