packages: icedove/icedove.spec, icedove/icedove-enigmail.manifest (REMOVED)...

[glen]

Author: glen                         Date: Tue Aug 17 13:26:19 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- enigmail: use chrome.manifest from tarball
- enigmail: package missing ipc shared library
- enigmail: proper attrs for shared libs
- enigmail: works now

---- Files affected:
packages/icedove:
   icedove.spec (1.91 -> 1.92) , icedove-enigmail.manifest (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.91 packages/icedove/icedove.spec:1.92
--- packages/icedove/icedove.spec:1.91	Tue Aug 17 14:51:47 2010
+++ packages/icedove/icedove.spec	Tue Aug 17 15:26:13 2010
@@ -34,7 +34,7 @@
 Summary(pl.UTF-8):	Icedove - klient poczty
 Name:		icedove
 Version:	3.1.2
-Release:	0.5
+Release:	0.7
 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
@@ -46,7 +46,6 @@
 Source3:	%{name}-rm_nonfree.sh
 Source4:	%{name}.desktop
 Source5:	%{name}.sh
-Source6:	%{name}-enigmail.manifest
 Patch0:		%{name}-branding.patch
 Patch1:		%{name}-enigmail-shared.patch
 Patch2:		%{name}-gcc.patch
@@ -359,11 +358,12 @@
 cp -rfLp chrome/enigmime.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
 cd -
 cp -a ../mailnews/extensions/enigmail/package/install.rdf $ext_dir
-cp -f %{SOURCE6} $ext_dir/chrome.manifest
+cp -a ../mailnews/extensions/enigmail/package/chrome.manifest $ext_dir/chrome.manifest
 %endif
 
 # remove unecessary stuff
@@ -449,7 +449,15 @@
 %if %{with enigmail}
 %files addon-enigmail
 %defattr(644,root,root,755)
-%{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}
+%dir %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}
+%{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/defaults
+%{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome
+%{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome.manifest
+%{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/install.rdf
+%dir %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components
+%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
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -458,6 +466,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.92  2010/08/17 13:26:13  glen
+- enigmail: use chrome.manifest from tarball
+- enigmail: package missing ipc shared library
+- enigmail: proper attrs for shared libs
+- enigmail: works now
+
 Revision 1.91  2010/08/17 12:51:47  glen
 - do not look (and mkdir) to /usr/{share,lib}/mozilla for extensions (we do not use share place yet in pld)
 
================================================================

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