rpms/gaim/devel .cvsignore, 1.29, 1.30 gaim-desktop.patch, 1.10, 1.11 gaim.spec, 1.85, 1.86 sources, 1.29, 1.30 gaim-1.2.1-dnd-url-crash.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16461

Modified Files:
	.cvsignore gaim-desktop.patch gaim.spec sources 
Removed Files:
	gaim-1.2.1-dnd-url-crash.patch 
Log Message:
- 1.3.0 many bug fixes and two security fixes
  long URL crash fix (#157017) CAN-2005-1261
  MSN bad messages crash fix (#157202) CAN-2005-1262



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	4 Apr 2005 03:36:12 -0000	1.29
+++ .cvsignore	11 May 2005 03:23:00 -0000	1.30
@@ -1 +1 @@
-gaim-1.2.1.tar.bz2
+gaim-1.3.0.tar.bz2

gaim-desktop.patch:
 gaim.desktop |   27 +++------------------------
 1 files changed, 3 insertions(+), 24 deletions(-)

Index: gaim-desktop.patch
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim-desktop.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gaim-desktop.patch	19 Feb 2005 04:08:04 -0000	1.10
+++ gaim-desktop.patch	11 May 2005 03:23:00 -0000	1.11
@@ -1,13 +1,14 @@
-diff -urN gaim-1.1.3.orig/gaim.desktop gaim-1.1.3/gaim.desktop
---- gaim-1.1.3.orig/gaim.desktop	2005-01-23 15:31:17.000000000 -0500
-+++ gaim-1.1.3/gaim.desktop	2005-02-18 22:50:26.000000000 -0500
-@@ -1,26 +1,7 @@
+diff -urN gaim-1.3.0cvs.orig/gaim.desktop gaim-1.3.0cvs/gaim.desktop
+--- gaim-1.3.0cvs.orig/gaim.desktop	2005-04-13 17:08:07.000000000 -1000
++++ gaim-1.3.0cvs/gaim.desktop	2005-05-08 13:21:58.000000000 -1000
+@@ -1,28 +1,7 @@
  [Desktop Entry]
  Encoding=UTF-8
 -Name=Gaim Internet Messenger
 -Name[da]=Gaim - internet beskeder
 -Name[de]=Gaim Internet Messenger
 -Name[fr]=Gaim Messagerie Instantanée
+-Name[hu]=Gaim IM
 -Name[it]=Gaim Internet Messenger
 -Name[ko]=게임 ë©”ì‹ ì €
 -Name[nl]=Gaim - Expresberichten
@@ -18,6 +19,7 @@
 -GenericName=Internet Messenger
 -GenericName[da]=Internet beskeder
 -GenericName[fr]=Messagerie instantanée
+-GenericName[hu]=IM
 -GenericName[it]=Internet Messenger
 -GenericName[ko]=ë©”ì‹ ì €
 -GenericName[nl]=Expresberichten
@@ -30,7 +32,7 @@
  Comment=Multi-protocol Messaging Client
  Comment[da]=Multiprotokolsklient til at sende og modtage beskeder
  Comment[de]=Multi-Protokoll Instant Messenger Client
-@@ -38,5 +19,5 @@
+@@ -41,5 +20,5 @@
  Icon=gaim.png
  Terminal=false
  Type=Application


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- gaim.spec	8 Apr 2005 02:25:07 -0000	1.85
+++ gaim.spec	11 May 2005 03:23:00 -0000	1.86
@@ -12,8 +12,8 @@
 %define silc_integration	1
 
 Name:		gaim
-Version:	1.2.1
-Release:	4.fc4
+Version:	1.3.0
+Release:	1.fc4
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -40,7 +40,7 @@
 Patch6:		gaim-1.0.1-naive-gnome-check.patch
 
 ## Patches 100-199: Upstream CVS Backports
-Patch147:	gaim-1.2.1-dnd-url-crash.patch
+#Patch147:	gaim-1.2.1-dnd-url-crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -105,7 +105,7 @@
 %patch6 -p1
 
 # CVS backports go here
-%patch147 -p2
+#%patch147 -p2
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}/%{version}-%{release}/g" configure
@@ -196,6 +196,11 @@
 %endif
 
 %changelog
+* Tue May 10 2005 Warren Togami <wtogami at redhat.com> 1:1.3.0-1
+- 1.3.0 many bug fixes and two security fixes
+  long URL crash fix (#157017) CAN-2005-1261
+  MSN bad messages crash fix (#157202) CAN-2005-1262
+
 * Thu Apr 07 2005 Warren Togami <wtogami at redhat.com> 1:1.2.1-4
 - use mozilla-nss everywhere because gnutls is buggy (#135778)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	4 Apr 2005 03:36:12 -0000	1.29
+++ sources	11 May 2005 03:23:00 -0000	1.30
@@ -1 +1 @@
-5ff8161f8d0db48bf302bfb5d7e097ac  gaim-1.2.1.tar.bz2
+4816d0e92f7a2622fb66e1b97d3c0b7d  gaim-1.3.0.tar.bz2


--- gaim-1.2.1-dnd-url-crash.patch DELETED ---