rpms/gaim/FC-3 .cvsignore, 1.21, 1.22 gaim-desktop.patch, 1.10, 1.11 gaim.spec, 1.58, 1.59 sources, 1.26, 1.27

[fedora-cvs-commits at redhat.com]

Author: wtogami

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

Modified Files:
	.cvsignore gaim-desktop.patch gaim.spec sources 
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
- use mozilla-nss everywhere because gnutls is buggy (#135778)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-3/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	4 Apr 2005 03:38:26 -0000	1.21
+++ .cvsignore	11 May 2005 03:27:02 -0000	1.22
@@ -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/FC-3/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:33:04 -0000	1.10
+++ gaim-desktop.patch	11 May 2005 03:27:02 -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/FC-3/gaim.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- gaim.spec	4 Apr 2005 03:38:26 -0000	1.58
+++ gaim.spec	11 May 2005 03:27:02 -0000	1.59
@@ -10,13 +10,9 @@
 %define evolution_integration	1
 # OPTION: SILC integration (FC3+)
 %define silc_integration	1
-# OPTION: GNUTLS integration (FC3+)
-#         1: Use gnutls
-#         0: Use mozilla-nss
-%define crypt_switch	1
 
 Name:		gaim
-Version:	1.2.1
+Version:	1.3.0
 Release:	1.fc3
 Epoch:		1
 License:	GPL
@@ -44,25 +40,22 @@
 Patch6:		gaim-1.0.1-naive-gnome-check.patch
 
 ## Patches 100-199: Upstream CVS Backports
-#Patch146:       gaim-1.1.4-yahoo_picture.patch
+#Patch147:	gaim-1.2.1-dnd-url-crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
 Provides:	gaim-devel = %{epoch}:%{version}-%{release}
 
 # Require Binary Compatible glib
-%define glib_ver %(pkg-config --modversion glib-2.0 | cut -d. -f 1,2)
+# returns bogus value if glib2-devel is not installed in order for parsing to succeed
+# bogus value wont make it into a real package
+%define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999")
 Requires:       glib2 >= %{glib_ver}
 
 # Basic Library Requirements
 BuildRequires:	libao-devel, startup-notification-devel, audiofile-devel
 
-# gnutls or mozilla-nss
-%if %{crypt_switch}
-BuildRequires:	gnutls-devel
-%else
 BuildRequires:	mozilla-nss-devel
-%endif
 BuildRequires:	gtk2-devel
 
 # krb5 needed for Zephyr (FC1+)
@@ -112,7 +105,7 @@
 %patch6 -p1
 
 # CVS backports go here
-#%patch146 -p2
+#%patch147 -p2
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}/%{version}-%{release}/g" configure
@@ -140,14 +133,10 @@
 %else
 	WITH_PERL="--disable-perl"
 %endif
-%if %{crypt_switch}
-	WITH_GNUTLS="--enable-gnutls=yes --enable-nss=no"
-%else
-	WITH_GNUTLS="--enable-gnutls=no --enable-nss=yes"
-%endif
 
 # disable tcl and tk because nobody uses it
-%configure --disable-tcl --disable-tk $WITH_KRB $WITH_SILC $WITH_PERL $WITH_GNUTLS CC=$CC
+# gnutls is buggy so use mozilla-nss on all distributions
+%configure --disable-tcl --disable-tk --enable-gnutls=no --enable-nss=yes $WITH_KRB $WITH_SILC $WITH_PERL
 # patch Makefile for PIE
 patch -p1 < %{PATCH5}
 make %{?_smp_mflags}
@@ -174,8 +163,6 @@
 %find_lang %{name}
 
 
-
-
 %post 
 /sbin/ldconfig -n %{_libdir}/gaim
 
@@ -209,8 +196,19 @@
 %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)
+
+* Wed Apr 06 2005 Warren Togami <wtogami at redhat.com> 1:1.2.1-2
+- 147: drag-n-drop URL crash fix
+
 * Sun Apr 03 2005 Warren Togami <wtogami at redhat.com> 1:1.2.1-1
-- update to 1.2.1 (minor bug fixes)
+- update to 1.2.1 CAN-2005-0965 CAN-2005-0966 CAN-2005-0967
 
 * Fri Mar 18 2005 Warren Togami <wtogami at redhat.com> 1:1.2.0-1
 - update to 1.2.0 (minor bug fixes)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-3/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	4 Apr 2005 03:38:26 -0000	1.26
+++ sources	11 May 2005 03:27:02 -0000	1.27
@@ -1 +1 @@
-5ff8161f8d0db48bf302bfb5d7e097ac  gaim-1.2.1.tar.bz2
+4816d0e92f7a2622fb66e1b97d3c0b7d  gaim-1.3.0.tar.bz2