Author: glen Date: Sun Apr 4 19:44:15 2010 GMT Module: packages Tag: HEAD ---- Log message: - forcibly remove nss/nspr/sqlite/mozldap libraries - list only shared libs we want to package
---- Files affected: packages/icedove: icedove.spec (1.66 -> 1.67) ---- Diffs: ================================================================ Index: packages/icedove/icedove.spec diff -u packages/icedove/icedove.spec:1.66 packages/icedove/icedove.spec:1.67 --- packages/icedove/icedove.spec:1.66 Wed Mar 31 13:29:16 2010 +++ packages/icedove/icedove.spec Sun Apr 4 21:44:10 2010 @@ -1,7 +1,9 @@ # $Revision$, $Date$ -# # TODO: # - separate spec for enigmail +# - fix icedove (building) and installing nss/nspr libs! +# - build and use system sqlite3 library! +# - build with system mozldap # # Conditional builds %bcond_without enigmail # don't build enigmail - GPG/PGP support @@ -23,7 +25,7 @@ Summary(pl.UTF-8): Icedove - klient poczty Name: icedove Version: 3.0.4 -Release: 1 +Release: 1.2 License: MPL 1.1 or GPL v2+ or LGPL v2.1+ Group: Applications/Networking Source0: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2 @@ -308,16 +310,14 @@ install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop %if %{with enigmail} -_enig_dir=$RPM_BUILD_ROOT%{_libdir}/%{name}/extensions/\{847b3a00-7ab1-11d4-8f02-006008948af5\} -install -d $_enig_dir/chrome -install -d $_enig_dir/components -install -d $_enig_dir/defaults/preferences -mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome/enigmail.jar $_enig_dir/chrome -mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/enig* $_enig_dir/components -mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/libenigmime.so $_enig_dir/components -mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/ipc.xpt $_enig_dir/components -mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults/preferences/enigmail.js $_enig_dir/defaults/preferences -cp -f mailnews/extensions/enigmail/package/install.rdf $_enig_dir +ext_dir=$RPM_BUILD_ROOT%{_libdir}/%{name}/extensions/\{847b3a00-7ab1-11d4-8f02-006008948af5\} +install -d $ext_dir/{chrome,components,defaults/preferences} +mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome/enigmail.jar $ext_dir/chrome +mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/enig* $ext_dir/components +mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/libenigmime.so $ext_dir/components +mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/ipc.xpt $ext_dir/components +mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults/preferences/enigmail.js $ext_dir/defaults/preferences +cp -f mailnews/extensions/enigmail/package/install.rdf $ext_dir rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults/preferences rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome/enigmail-en-US.jar rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome/enigmail-skin.jar @@ -325,13 +325,22 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/components/enig* rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/libenigmime.so rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/ipc.xpt -cp -f %{SOURCE6} $_enig_dir/chrome.manifest +cp -f %{SOURCE6} $ext_dir/chrome.manifest cp -f icedove/branding/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/icedove.png %endif # win32 stuff rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/dirver +# nss +rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freebl3,nss3,nssckbi,nssdbm3,nssutil3,smime3,softokn3,ssl3}.* +# nspr +rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{nspr4,plc4,plds4}.so +# sqlite3 +rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/libsqlite3.so +# mozldap +rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap,ssldap}60.so + %clean rm -rf $RPM_BUILD_ROOT @@ -358,7 +367,9 @@ %attr(755,root,root) %{_libdir}/%{name}/components/*.so %{_libdir}/%{name}/components/*.js %{_libdir}/%{name}/components/*.xpt -%attr(755,root,root) %{_libdir}/%{name}/*.so +%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so +%attr(755,root,root) %{_libdir}/%{name}/libxpcom.so +%attr(755,root,root) %{_libdir}/%{name}/libxpcom_core.so %attr(755,root,root) %{_libdir}/%{name}/*.sh %attr(755,root,root) %{_libdir}/%{name}/*-bin %attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client @@ -412,6 +423,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.67 2010/04/04 19:44:10 glen +- forcibly remove nss/nspr/sqlite/mozldap libraries +- list only shared libs we want to package + Revision 1.66 2010/03/31 11:29:16 duddits - up to 3.0.4 - libpng.patch obsoleted ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove.spec?r1=1.66&r2=1.67&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
