rpms/pidgin/F-11 .cvsignore, 1.26, 1.27 pidgin.spec, 1.73, 1.74 sources, 1.26, 1.27 pidgin-NOT-UPSTREAM-2.5.3-reread-resolvconf.patch, 1.1, NONE

Tue Aug 18 17:38:23 UTC 2009

Author: wtogami

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

Modified Files:
	.cvsignore pidgin.spec sources 
Removed Files:
	pidgin-NOT-UPSTREAM-2.5.3-reread-resolvconf.patch 
Log Message:
- CVE-2009-2694
- Voice and Video support via farsight2 (Fedora 11+)
- Numerous other bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-11/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27

--- .cvsignore	29 Jun 2009 00:39:43 -0000	1.26
+++ .cvsignore	18 Aug 2009 17:38:22 -0000	1.27
@@ -1 +1 @@
-pidgin-2.5.8.tar.bz2
+pidgin-2.6.0.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-11/pidgin.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- pidgin.spec	20 Jul 2009 01:15:21 -0000	1.73
+++ pidgin.spec	18 Aug 2009 17:38:23 -0000	1.74
@@ -30,6 +30,8 @@
 %define api_docs		0
 %define krb4_removed		0
 %define nss_md2_disabled	0
+%define vv_support		0
+%define libidn_support		0
 
 # RHEL4: Use ALSA aplay to output sounds because it lacks gstreamer
 %if 0%{?fedora} < 5
@@ -61,19 +63,26 @@
 %define perl_embed_separated	1
 %define api_docs		1
 %endif
-# F11+: New NSS (3.12.3) disables weaker MD2 algorithm
+# F10+: New NSS (3.12.3) disables weaker MD2 algorithm
 %if 0%{?fedora} >= 10
 %define nss_md2_disabled	1
 %endif
+# F11+: voice and video support
+%if 0%{?fedora} >= 11
+%define vv_support	1
+%endif
+# F11+: libidn for punycode domain support
+%if 0%{?fedora} >= 11
+%define libidn_support	1
+%endif
 # F12+: krb4 removed
 %if 0%{?fedora} >= 12
 %define krb4_removed	1
 %endif
 
-
 Name:		pidgin
-Version:	2.5.8
-Release:	2%{?dist}
+Version:	2.6.0
+Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -104,11 +113,9 @@ Source2:        one_time_password.c
 
 
 ## Patches 0-99: Fedora specific or upstream wont accept
-Patch0: pidgin-NOT-UPSTREAM-2.5.3-reread-resolvconf.patch
-Patch1: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
+Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
 
 ## Patches 100+: To be Included in Future Upstream
-Patch100: pidgin-2.5.8-nss-md2.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -201,6 +208,14 @@ BuildRequires:  perl-devel
 %if %{perl_embed_separated}
 BuildRequires:  perl(ExtUtils::Embed)
 %endif
+# Voice and video support (F11+)
+%if %{vv_support}
+BuildRequires:  farsight2-devel
+%endif
+# libidn punycode domain support (F11+)
+%if %{libidn_support}
+BuildRequires:  libidn-devel
+%endif
 
 %if %{api_docs}
 BuildRequires: doxygen
@@ -351,17 +366,13 @@ Doxygen generated API documentation.
 
 %prep
 echo "FEDORA=%{fedora} RHEL=%{rhel}"
-%setup -q
+%setup -q 
 ## Patches 0-99: Fedora specific or upstream wont accept
-%patch0 -p1 -b .resolv
 %if %{force_sound_aplay}
-%patch1 -p1 -b .aplay
+%patch0 -p1 -b .aplay
 %endif
 
 ## Patches 100+: To be Included in Future Upstream
-%if %{nss_md2_disabled}
-%patch100 -p0 -b .nssmd2
-%endif
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -398,6 +409,9 @@ SWITCHES="--with-extraversion=%{release}
 %if ! %{meanwhile_integration}
 	SWITCHES="$SWITCHES --disable-meanwhile"
 %endif
+%if ! %{libidn_support}
+	SWITCHES="$SWITCHES --disable-idn"
+%endif
 
 # FC5+ automatic -fstack-protector-all switch
 export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
@@ -429,14 +443,13 @@ install -m 0755 libpurple/plugins/one_ti
 
 desktop-file-install --vendor pidgin --delete-original       \
   --add-category X-Red-Hat-Base                            \
-  --copy-generic-name-to-name                              \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications            \
   $RPM_BUILD_ROOT%{_datadir}/applications/pidgin.desktop
 
 # remove libtool libraries and static libraries
 rm -f `find $RPM_BUILD_ROOT -name "*.la" -o -name "*.a"`
-# remove the old perllocal.pod file
-rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+# remove the perllocal.pod file
+find $RPM_BUILD_ROOT -name perllocal.pod |xargs rm
 # remove relnot.so plugin since it is unusable for our package
 rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/relnot.so
 # remove dummy nullclient
@@ -448,6 +461,11 @@ install -m 644 prefs.xml $RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
 
+# remove non-plugin unrequired library symlinks
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so
+
 # make sure that we can write to all the files we've installed
 # so that they are properly stripped
 chmod -R u+w $RPM_BUILD_ROOT/*
@@ -513,6 +531,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pidgin
 %{_bindir}/gaim
 %{_libdir}/pidgin/
+%exclude %{_libdir}/pidgin/perl
 %{_mandir}/man1/pidgin.*
 %{_datadir}/applications/pidgin.desktop
 %{_datadir}/pixmaps/pidgin/
@@ -522,9 +541,7 @@ rm -rf $RPM_BUILD_ROOT
 %files perl
 %defattr(-,root,root,-)
 %{_mandir}/man3/Pidgin*
-%{perl_vendorarch}/Pidgin.pm
-%dir %{perl_vendorarch}/auto/Pidgin/
-%{perl_vendorarch}/auto/Pidgin/Pidgin.so
+%{_libdir}/pidgin/perl/
 
 %files devel
 %defattr(-,root,root,-)
@@ -534,6 +551,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -f pidgin.lang -n libpurple
 %defattr(-,root,root,-)
 %{_libdir}/purple-2/
+%exclude %{_libdir}/purple-2/perl
 %{_libdir}/libpurple.so.*
 %{_datadir}/sounds/purple/
 %{_datadir}/purple
@@ -550,6 +568,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %exclude %{_libdir}/purple-2/tcl.so
 %exclude %{_libdir}/purple-2/perl.so
+%exclude %{_libdir}/purple-2/perl/
 
 %files -n libpurple-devel
 %defattr(-,root,root,-)
@@ -565,10 +584,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_mandir}/man3/Purple*
 %{_libdir}/purple-2/perl.so
-%{perl_vendorarch}/Purple.pm
-%dir %{perl_vendorarch}/auto/Purple/
-%{perl_vendorarch}/auto/Purple/Purple.so
-%{perl_vendorarch}/auto/Purple/autosplit.ix
+%{_libdir}/purple-2/perl/
 
 %files -n libpurple-tcl
 %defattr(-,root,root,-)
@@ -598,6 +614,38 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 18 2009 Warren Togami <wtogami at redhat.com> 2.6.0-1
+- CVE-2009-2694
+- Voice and Video support via farsight2 (Fedora 11+)
+- Numerous other bug fixes
+
+* Tue Aug 06 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.11.20090812
+- new snapshot at the request of maiku
+
+* Tue Aug 06 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.10.20090806
+- new snapshot - theoretically better sound quality in voice chat
+
+* Tue Aug 04 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.9.20090804
+- new snapshot
+
+* Mon Jul 27 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.8.20090727
+- new snapshot
+
+* Mon Jul 27 2009 Stu Tomlinson <stu at nosnilmot.com> 2.6.0-0.6.20090721
+- Prevent main libpurple & pidgin packages depending on perl (#513902)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.0-0.5.20090721
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.4.20090721
+- rebuild
+
+* Tue Jul 21 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.3.20090721
+- prevent crash with no camera when closing vv window
+
+* Tue Jul 21 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.1.20090721
+- 2.6.0 snapshot with voice and video support via farsight2
+
 * Sat Jul 11 2009 Stu Tomlison <stu at nosnilmot.com> 2.5.8-2
 - Backport patch from upstream to enable NSS to recognize root CA
   certificates that use MD2 & MD4 algorithms in their signature, as


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	29 Jun 2009 00:39:43 -0000	1.26
+++ sources	18 Aug 2009 17:38:23 -0000	1.27
@@ -1 +1 @@
-c207407dca71c6357c82135875e472f0  pidgin-2.5.8.tar.bz2
+235d8c322d42b711d3ce82b625f5526a  pidgin-2.6.0.tar.bz2


--- pidgin-NOT-UPSTREAM-2.5.3-reread-resolvconf.patch DELETED ---


