rpms/pidgin/F-7 .cvsignore, 1.5, 1.6 pidgin.spec, 1.17, 1.18 sources, 1.5, 1.6 pidgin-2.0.1-early-g_thread_init.patch, 1.1, NONE pidgin-2.0.1-gevolution-fix.patch, 1.1, NONE pidgin-2.0.1-purple-remote-oscar.patch, 1.1, NONE pidgin-2.0.1-purple-remote-syntax.patch, 1.1, NONE

[Warren Togami (wtogami)]

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17365

Modified Files:
	.cvsignore pidgin.spec sources 
Removed Files:
	pidgin-2.0.1-early-g_thread_init.patch 
	pidgin-2.0.1-gevolution-fix.patch 
	pidgin-2.0.1-purple-remote-oscar.patch 
	pidgin-2.0.1-purple-remote-syntax.patch 
Log Message:
- pidgin-devel obsoletes/provides gaim
  This smoothens multilib the upgrade path.
- 2.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 May 2007 01:17:29 -0000	1.5
+++ .cvsignore	19 Jun 2007 18:43:07 -0000	1.6
@@ -1 +1 @@
-pidgin-2.0.1.tar.bz2
+pidgin-2.0.2.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-7/pidgin.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pidgin.spec	14 Jun 2007 00:22:57 -0000	1.17
+++ pidgin.spec	19 Jun 2007 18:43:07 -0000	1.18
@@ -22,14 +22,14 @@
 %define dbus_glib_splt		1
 # OPTION: Bonjour support (FC6+)
 %define bonjour_support		1
-# OPTION: Meanwhile integration (FC6+)
+# OPTION: Meanwhile integration (F7+)
 %define meanwhile_integration	1
 # OPTION: Perl devel separated out (F7+)
 %define perl_devel_separated    1
 
 Name:		pidgin
-Version:	2.0.1
-Release:	5%{?dist}
+Version:	2.0.2
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://pidgin.im/
@@ -55,10 +55,6 @@
 ## Patches 0-99: Fedora specific or upstream wont accept
 
 ## Patches 100+: To be Included in Future Upstream
-Patch100: pidgin-2.0.1-early-g_thread_init.patch
-Patch101: pidgin-2.0.1-purple-remote-syntax.patch
-Patch102: pidgin-2.0.1-purple-remote-oscar.patch
-Patch103: pidgin-2.0.1-gevolution-fix.patch
 Patch113: pidgin-2.0.0-beta7-reread-resolvconf.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -173,6 +169,9 @@
 Requires: gtk2-devel
 Obsoletes: gaim-devel
 Provides:  gaim-devel
+Obsoletes: gaim < 999:1
+Provides:  gaim = 999:1
+
 
 %description devel
 The pidgin-devel package contains the header files, developer
@@ -282,10 +281,6 @@
 ## Patches 0-99: Fedora specific or upstream wont accept
 
 ## Patches 100+: To be Included in Future Upstream
-%patch100 -p0
-%patch101 -p0
-%patch102 -p0
-%patch103 -p0
 %patch113 -p1
 
 # Relabel internal version for support purposes
@@ -497,6 +492,13 @@
 
 
 %changelog
+* Tue Jun 19 2007 Warren Togami <wtogami at redhat.com> - 2.0.2-2
+- pidgin-devel obsoletes/provides gaim
+  This smoothens multilib the upgrade path.
+
+* Fri Jun 15 2007 Stu Tomlinson <stu at nosnilmot.com> - 2.0.2-1
+- 2.0.2
+
 * Wed Jun 6 2007 Stu Tomlinson <stu at nosnilmot.com> - 2.0.1-5
 - Enable Bonjour support (#242949)
 - Fix building against latest evolution-data-server


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 May 2007 01:17:29 -0000	1.5
+++ sources	19 Jun 2007 18:43:07 -0000	1.6
@@ -1 +1 @@
-51062e232c1ba5429d8be43623983fdf  pidgin-2.0.1.tar.bz2
+613a357b2b1e030433fdfa680483d00f  pidgin-2.0.2.tar.bz2


--- pidgin-2.0.1-early-g_thread_init.patch DELETED ---


--- pidgin-2.0.1-gevolution-fix.patch DELETED ---


--- pidgin-2.0.1-purple-remote-oscar.patch DELETED ---


--- pidgin-2.0.1-purple-remote-syntax.patch DELETED ---