rpms/pidgin/F-11 .cvsignore, 1.31, 1.32 pidgin.spec, 1.80, 1.81 sources, 1.31, 1.32 one_time_password.c, 1.1, NONE

[Warren Togami 砥上勇]

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30834

Modified Files:
	.cvsignore pidgin.spec sources 
Removed Files:
	one_time_password.c 
Log Message:
- 2.6.5
- CVE-2010-0013
- Other bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-11/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	30 Nov 2009 06:18:21 -0000	1.31
+++ .cvsignore	8 Jan 2010 20:57:41 -0000	1.32
@@ -1 +1 @@
-pidgin-2.6.4.tar.bz2
+pidgin-2.6.5.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-11/pidgin.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- pidgin.spec	30 Nov 2009 06:18:21 -0000	1.80
+++ pidgin.spec	8 Jan 2010 20:57:41 -0000	1.81
@@ -36,6 +36,8 @@
 %define nss_md2_disabled	0
 %define vv_support		0
 %define libidn_support		0
+%define disable_silc		0
+%define disable_evolution       0
 
 # RHEL4: Use ALSA aplay to output sounds because it lacks gstreamer
 %if 0%{?fedora} < 5
@@ -83,9 +85,19 @@
 %if 0%{?fedora} >= 12
 %define krb4_removed	1
 %endif
+# EL6: Disable SILC protocol
+# (get rid of extra crypto lib for perpetually broken protocol that nobody uses)
+%if 0%{?rhel} == 6
+%define disable_silc	1
+%endif
+# F13+: Temporarily disable evolution integration until it becomes fixed
+# http://developer.pidgin.im/ticket/10852
+%if 0%{?fedora} >= 13
+%define disable_evolution 1
+%endif
 
 Name:		pidgin
-Version:	2.6.4
+Version:	2.6.5
 Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
@@ -113,8 +125,6 @@ ExcludeArch:    s390 s390x
 # - Browser "GNOME Default"
 # - Smiley Theme "Default"
 Source1:	purple-fedora-prefs.xml
-Source2:        one_time_password.c
-
 
 ## Patches 0-99: Fedora specific or upstream wont accept
 Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
@@ -164,9 +174,13 @@ BuildRequires:	krb5-devel
 # gtkspell integration (FC1+)
 BuildRequires:	gtkspell-devel
 # Evolution integration (FC3+)
+%if ! %{disable_evolution}
 BuildRequires:	evolution-data-server-devel
+%endif
 # SILC integration (FC3+)
+%if ! %{disable_silc}
 BuildRequires:	libsilc-devel
+%endif
 # DBus integration (FC5+)
 %if %{dbus_integration}
 BuildRequires:  dbus-devel >= 0.60
@@ -395,7 +409,11 @@ SWITCHES="--with-extraversion=%{release}
 	SWITCHES="$SWITCHES --with-krb4"
 %endif
 	SWITCHES="$SWITCHES --enable-perl"
+%if ! %{disable_evolution}
 	SWITCHES="$SWITCHES --enable-gevolution"
+%else
+	SWITCHES="$SWITCHES --disable-gevolution"
+%endif
 %if %{dbus_integration}
 	SWITCHES="$SWITCHES --enable-dbus"
 %else
@@ -433,8 +451,7 @@ export CFLAGS="$RPM_OPT_FLAGS"
 
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
-# one_time_password plugin, to be merged upstream soon
-cp %{SOURCE2} libpurple/plugins/
+# one_time_password plugin, included upstream but not built by default
 cd libpurple/plugins/
 make one_time_password.so
 cd -
@@ -623,6 +640,17 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Jan  7 2010 Warren Togami <wtogami at redhat.com> - 2.6.5-1
+- 2.6.5
+- CVE-2010-0013
+- Other bug fixes
+
+* Tue Dec  8 2009 Warren Togami <wtogami at redhat.com> - 2.6.4-4
+- temporarily disable evolution integration in F13 until it is fixed
+
+* Wed Dec 02 2009 Warren Togami <wtogami at redhat.com> 2.6.4-2
+- disable SILC in EL6 builds
+
 * Mon Nov 30 2009 Warren Togami <wtogami at redhat.com> 2.6.4-1
 - 2.6.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-11/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	30 Nov 2009 06:18:21 -0000	1.31
+++ sources	8 Jan 2010 20:57:42 -0000	1.32
@@ -1 +1 @@
-6e1dc8b9dd6983a54ff3a6de33efa778  pidgin-2.6.4.tar.bz2
+90847ed22ec830db5d9768748812b661  pidgin-2.6.5.tar.bz2


--- one_time_password.c DELETED ---