Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14543
Modified Files:
.cvsignore enigmail-rdf.patch sources
thunderbird-enigmail.spec
Log Message:
update to 1.2.1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 17 Jul 2011 20:43:46 -0000 1.9
+++ .cvsignore 30 Jul 2011 17:37:21 -0000 1.10
@@ -1,2 +1,2 @@
thunderbird-5.0.source.tar.bz2
-enigmail-1.2.tar.gz
+enigmail-1.2.1.tar.gz
enigmail-rdf.patch:
install.rdf | 8 --------
1 file changed, 8 deletions(-)
Index: enigmail-rdf.patch
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/enigmail-rdf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- enigmail-rdf.patch 17 Jul 2011 20:43:47 -0000 1.1
+++ enigmail-rdf.patch 30 Jul 2011 17:37:22 -0000 1.2
@@ -1,20 +1,12 @@
---- enigmail/package/install.rdf.orig 2011-07-17 20:18:23.000000000 +0200
-+++ enigmail/package/install.rdf 2011-07-17 20:18:32.000000000 +0200
-@@ -5,7 +5,7 @@
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>{847b3a00-7ab1-11d4-8f02-006008948af5}</em:id>
-- <em:version>1.2pre</em:version>
-+ <em:version>1.2</em:version>
- <em:type>2</em:type> <!-- type = extension -->
- <em:unpack>true</em:unpack>
-
+diff -up enigmail/package/install.rdf.orig enigmail/package/install.rdf
+--- enigmail/package/install.rdf.orig 2011-07-26 17:53:13.000000000 +0200
++++ enigmail/package/install.rdf 2011-07-30 19:10:04.392345142 +0200
@@ -27,14 +27,6 @@
- <em:maxVersion>2.1.*</em:maxVersion>
+ <em:maxVersion>2.2.*</em:maxVersion>
</Description>
</em:targetApplication>
- <!-- em:targetApplication>
-- < ! -- Spicebird -- >
+- < ! - - Spicebird - - >
- <Description>
- <em:id>{ee53ece0-255c-4cc6-8a7e-81a8b6e5ba2c}</em:id>
- <em:minVersion>0.7</em:minVersion>
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 17 Jul 2011 20:43:47 -0000 1.10
+++ sources 30 Jul 2011 17:37:22 -0000 1.11
@@ -1,2 +1,2 @@
0bbacea54b4b8fc4ff20e73b3278c1ba thunderbird-5.0.source.tar.bz2
-f8ba15164adc1c0e8328582146461aec enigmail-1.2.tar.gz
+ff0918d49f5cd10cd635e6f22995bd30 enigmail-1.2.1.tar.gz
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-enigmail.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- thunderbird-enigmail.spec 17 Jul 2011 21:05:33 -0000 1.11
+++ thunderbird-enigmail.spec 30 Jul 2011 17:37:22 -0000 1.12
@@ -1,8 +1,8 @@
-%define nspr_version 4.8
+%define nspr_version 4.8.7
%define nss_version 3.12.8
-%define cairo_version 1.8.8
+%define cairo_version 1.10.0
%define freetype_version 2.1.9
-%define sqlite_version 3.6.14
+%define sqlite_version 3.6.22
%define libnotify_version 0.4
%define build_langpacks 1
%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
@@ -26,11 +26,11 @@
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.2
+Version: 1.2.1
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
-Release: 1%{?dist}.1
+Release: 1%{?dist}
%endif
URL:
http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
@@ -150,12 +150,15 @@
%{__rm} -f .mozconfig
+# From Thunderbnird
%{__cp} %{SOURCE10} .mozconfig
%if %{official_branding}
%{__cat} %{SOURCE11} >> .mozconfig
%endif
# ===== Enigmail work =====
+echo 'ac_add_options --enable-chrome-format=jar' >>.mozconfig
+
%if 0%{?CVS}
mkdir mailnews/extensions/enigmail
tar xzf %{SOURCE100} -C mailnews/extensions/enigmail
@@ -219,13 +222,6 @@
pushd mailnews/extensions/enigmail
./makemake -r
make
-popd
-
-pushd mozilla/dist/bin/chrome/enigmail
-zip ../enigmail.jar -r content locale skin
-popd
-
-pushd mailnews/extensions/enigmail
make xpi
popd
@@ -254,6 +250,10 @@
#===============================================================================
%changelog
+* Sat Jul 30 2011 Remi Collet <remi(a)fedoraproject.org> 1.2.1-1
+- Enigmail 1.2.1 for Thunderbird 5.0
+- add --enable-chrome-format=jar to generate enigmail.jar
+
* Sun Jul 17 2011 Remi Collet <remi(a)fedoraproject.org> 1.2-1.1
- fix BR (dos2unix + php-cli)