rpms/seamonkey/F-7 .cvsignore, 1.12, 1.13 firefox-1.5-nopangoxft.patch, 1.1, 1.2 mozilla-nspr-packages.patch, 1.2, 1.3 seamonkey.spec, 1.22, 1.23 sources, 1.12, 1.13

[Kai Engert (kengert)]

Author: kengert

Update of /cvs/extras/rpms/seamonkey/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19380

Modified Files:
	.cvsignore firefox-1.5-nopangoxft.patch 
	mozilla-nspr-packages.patch seamonkey.spec sources 
Log Message:
* Fri Oct 19 2007 Kai Engert <kengert at redhat.com> - 1.1.5-1
- SeaMonkey 1.1.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/F-7/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	20 Jul 2007 00:43:39 -0000	1.12
+++ .cvsignore	19 Oct 2007 17:32:25 -0000	1.13
@@ -1 +1 @@
-seamonkey-1.1.3.source.tar.bz2
+seamonkey-1.1.5.source.tar.bz2

firefox-1.5-nopangoxft.patch:

Index: firefox-1.5-nopangoxft.patch
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/F-7/firefox-1.5-nopangoxft.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-1.5-nopangoxft.patch	7 Sep 2006 02:51:24 -0000	1.1
+++ firefox-1.5-nopangoxft.patch	19 Oct 2007 17:32:25 -0000	1.2
@@ -1,17 +1,5 @@
 --- mozilla/gfx/src/gtk/mozilla-decoder.cpp.noxft	2004-11-07 18:59:23.000000000 -0500
 +++ mozilla/gfx/src/gtk/mozilla-decoder.cpp	2006-08-06 18:24:37.000000000 -0400
-@@ -40,10 +40,9 @@
- #define PANGO_ENABLE_ENGINE
- 
- #include "mozilla-decoder.h"
--#include <pango/pangoxft.h>
- #include <pango/pangofc-fontmap.h>
- #include <pango/pangofc-font.h>
--#include <gdk/gdkx.h>
-+#include <gdk/gdkpango.h>
- 
- #include "nsString.h"
- #include "nsIPersistentProperties2.h"
 @@ -54,6 +53,7 @@
  #include "nsCompressedCharMap.h"
  
@@ -20,26 +8,3 @@
  
  G_DEFINE_TYPE (MozillaDecoder, mozilla_decoder, PANGO_TYPE_FC_DECODER)
  
-@@ -145,6 +145,13 @@ mozilla_decoders_init(void)
-     if (initialized)
-         return 0;
- 
-+    PangoContext* context = gdk_pango_context_get ();
-+    PangoFontMap* fontmap = pango_context_get_font_map (context);
-+    g_object_unref (context);
-+    
-+    if (!PANGO_IS_FC_FONT_MAP (fontmap))
-+        return -1;
-+
-     encoder_hash = g_hash_table_new(g_str_hash, g_str_equal);
-     cmap_hash = g_hash_table_new(g_str_hash, g_str_equal);
-     wide_hash = g_hash_table_new(g_str_hash, g_str_equal);
-@@ -208,7 +215,7 @@ mozilla_decoders_init(void)
-         }
-     }
- 
--    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
-+    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(fontmap),
-                                             mozilla_find_decoder,
-                                             NULL,
-                                             NULL);

mozilla-nspr-packages.patch:

Index: mozilla-nspr-packages.patch
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/F-7/mozilla-nspr-packages.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mozilla-nspr-packages.patch	7 Feb 2007 07:52:56 -0000	1.2
+++ mozilla-nspr-packages.patch	19 Oct 2007 17:32:25 -0000	1.3
@@ -1,10 +1,8 @@
---- mozilla/xpinstall/packager/packages-unix.nsprpack	2007-02-07 04:21:44.000000000 +0100
-+++ mozilla/xpinstall/packager/packages-unix	2007-02-07 04:29:55.000000000 +0100
-@@ -42,12 +42,8 @@
- bin/defaults/messenger/SpamCatcher.sfd
- bin/defaults/messenger/SpamPal.sfd
+diff -up ./xpinstall/packager/packages-unix.nsprpack ./xpinstall/packager/packages-unix
+--- ./xpinstall/packager/packages-unix.nsprpack	2007-10-19 07:27:07.000000000 +0200
++++ ./xpinstall/packager/packages-unix	2007-10-19 07:27:45.000000000 +0200
+@@ -42,9 +42,6 @@ bin/isp/SpamPal.sfd
  
--
  [xpcom]
  bin/libmozjs.so
 -bin/libnspr4.so
@@ -13,7 +11,7 @@
  bin/cpu/sparcv8plus/libnspr_flt4.so
  bin/libxpcom.so
  bin/libxpcom_core.so
-@@ -58,6 +54,11 @@
+@@ -55,6 +52,11 @@ bin/components/libjar50.so
  bin/libxpcom_compat.so
  bin/components/libxpcom_compat_c.so
  
@@ -25,7 +23,7 @@
  [browser]
  bin/seamonkey
  bin/seamonkey-bin
-@@ -469,13 +470,17 @@
+@@ -465,13 +467,17 @@ bin/components/qfaservices.xpt
  bin/components/talkback/*
  
  [psm]
@@ -44,7 +42,7 @@
  bin/libnss3.so
  bin/libsmime3.so
  bin/libsoftokn3.chk
-@@ -493,8 +498,6 @@
+@@ -489,8 +495,6 @@ bin/libfreebl_64fpu_3.so
  bin/libfreebl_64int_3.chk
  bin/libfreebl_64int_3.so
  bin/libssl3.so


Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/F-7/seamonkey.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- seamonkey.spec	27 Jul 2007 12:24:43 -0000	1.22
+++ seamonkey.spec	19 Oct 2007 17:32:25 -0000	1.23
@@ -10,8 +10,8 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        1.1.3
-Release:        2%{?dist}
+Version:        1.1.5
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -430,6 +430,8 @@
 
 
 %changelog
+* Fri Oct 19 2007 Kai Engert <kengert at redhat.com> - 1.1.5-1
+- SeaMonkey 1.1.5
 * Fri Jul 27 2007 Martin Stransky <stransky at redhat.com> - 1.1.3-2
 - added pango patches
 * Fri Jul 20 2007 Kai Engert <kengert at redhat.com> - 1.1.3-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/F-7/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	20 Jul 2007 00:43:39 -0000	1.12
+++ sources	19 Oct 2007 17:32:25 -0000	1.13
@@ -1 +1 @@
-adede0ee02c302011ecd49f8e83e7c0f  seamonkey-1.1.3.source.tar.bz2
+95f9bcfef69f1bb79594bc7ffe5f0050  seamonkey-1.1.5.source.tar.bz2