rpms/gaim/devel .cvsignore, 1.27, 1.28 gaim.spec, 1.75, 1.76 sources, 1.27, 1.28 gaim-1.1.4-gadugadu-crash.patch, 1.1, NONE gaim-1.1.4-nmcomm-glibc-macro.patch, 1.2, NONE gaim-1.1.4-yahoo_filexfer.patch, 1.1, NONE gaim-1.1.4-yahoo_picture.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

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

Modified Files:
	.cvsignore gaim.spec sources 
Removed Files:
	gaim-1.1.4-gadugadu-crash.patch 
	gaim-1.1.4-nmcomm-glibc-macro.patch 
	gaim-1.1.4-yahoo_filexfer.patch gaim-1.1.4-yahoo_picture.patch 
Log Message:
update to 1.2.0 (minor bug fixes)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	25 Feb 2005 03:06:23 -0000	1.27
+++ .cvsignore	18 Mar 2005 20:52:27 -0000	1.28
@@ -9,3 +9,4 @@
 gaim-1.1.3.tar.bz2
 gaim-1.1.4-cvs2005022.patch.bz2
 gaim-1.1.4.tar.bz2
+gaim-1.2.0.tar.bz2


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- gaim.spec	7 Mar 2005 22:09:09 -0000	1.75
+++ gaim.spec	18 Mar 2005 20:52:27 -0000	1.76
@@ -16,8 +16,8 @@
 %define crypt_switch	1
 
 Name:		gaim
-Version:	1.1.4
-Release:	5
+Version:	1.2.0
+Release:	1
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -44,10 +44,7 @@
 Patch6:		gaim-1.0.1-naive-gnome-check.patch
 
 ## Patches 100-199: Upstream CVS Backports
-Patch143:       gaim-1.1.4-gadugadu-crash.patch
-Patch144:       gaim-1.1.4-nmcomm-glibc-macro.patch
-Patch145:       gaim-1.1.4-yahoo_filexfer.patch
-Patch146:       gaim-1.1.4-yahoo_picture.patch
+#Patch146:       gaim-1.1.4-yahoo_picture.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -115,10 +112,7 @@
 %patch6 -p1
 
 # CVS backports go here
-%patch143 -p2
-%patch144 -p1
-%patch145 -p2
-%patch146 -p2
+#%patch146 -p2
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}/%{version}-%{release}/g" configure
@@ -215,6 +209,9 @@
 %endif
 
 %changelog
+* Fri Mar 18 2005 Warren Togami <wtogami at redhat.com> 1:1.2.0-1
+- update to 1.2.0 (minor bug fixes)
+
 * Mon Mar 07 2005 Warren Togami <wtogami at redhat.com> 1:1.1.4-5
 - Copy before modifying prefs.xml
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	25 Feb 2005 03:06:23 -0000	1.27
+++ sources	18 Mar 2005 20:52:27 -0000	1.28
@@ -1 +1 @@
-bef100062823ae1a10d041b022e05d9c  gaim-1.1.4.tar.bz2
+220a1a61a67a621ce5b5d96b279c883b  gaim-1.2.0.tar.bz2


--- gaim-1.1.4-gadugadu-crash.patch DELETED ---


--- gaim-1.1.4-nmcomm-glibc-macro.patch DELETED ---


--- gaim-1.1.4-yahoo_filexfer.patch DELETED ---


--- gaim-1.1.4-yahoo_picture.patch DELETED ---