Djam/pidgin
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/pidgin.git synced 2025-02-23 13:32:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automatic import for version 2.10.1

Browse source
This commit is contained in:
Rosa 2012-02-01 15:19:35 +04:00
parent 1f2ad7a2bb
commit f9526a5dea
4 changed files with 55 additions and 319 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources:
"pidgin-2.9.0.tar.bz2": 632c681030304443a911c9eeca6d582df0a24fbb
"pidgin-2.10.1.tar.bz2": 045ed0fd7dfedada6e082e7a4564648b55950064

24
pidgin-2.10.0-gg-search-by-uin.patch Normal file
View file

@ -0,0 +1,24 @@
--- pidgin-2.10.0/libpurple/protocols/gg/gg.c.gg-search 2011-08-18 10:51:03.000000000 +0200
+++ pidgin-2.10.0/libpurple/protocols/gg/gg.c 2011-08-22 15:57:02.000000000 +0200
@@ -533,6 +533,9 @@ static void ggp_callback_find_buddies(Pu
purple_request_fields_get_string(fields, "firstname"));
form->nickname = g_strdup(
purple_request_fields_get_string(fields, "nickname"));
+ form->uin = charset_convert(
+ purple_request_fields_get_string(fields, "uin"),
+ "UTF-8", "CP1250");
form->city = g_strdup(
purple_request_fields_get_string(fields, "city"));
form->birthyear = g_strdup(
@@ -586,6 +589,11 @@ static void ggp_find_buddies(PurplePlugi
purple_request_field_string_set_masked(field, FALSE);
purple_request_field_group_add_field(group, field);
+ field = purple_request_field_string_new("uin",
+ _("UIN"), NULL, FALSE);
+ purple_request_field_string_set_masked(field, FALSE);
+ purple_request_field_group_add_field(group, field);
+
field = purple_request_field_string_new("city",
_("City"), NULL, FALSE);
purple_request_field_string_set_masked(field, FALSE);

25
pidgin-2.3.1-gg-search-by-uin.patch
View file

@ -1,25 +0,0 @@
diff -Naur pidgin-2.3.1/libpurple/protocols/gg/gg.c pidgin-2.3.1.tpg/libpurple/protocols/gg/gg.c
--- pidgin-2.3.1/libpurple/protocols/gg/gg.c 2007-12-07 14:37:05.000000000 +0000
+++ pidgin-2.3.1.tpg/libpurple/protocols/gg/gg.c 2008-01-15 15:10:45.000000000 +0000
@@ -580,6 +580,9 @@
form->nickname = charset_convert(
purple_request_fields_get_string(fields, "nickname"),
"UTF-8", "CP1250");
+ form->uin = charset_convert(
+ purple_request_fields_get_string(fields, "uin"),
+ "UTF-8", "CP1250");
form->city = charset_convert(
purple_request_fields_get_string(fields, "city"),
"UTF-8", "CP1250");
@@ -639,6 +642,11 @@
purple_request_field_string_set_masked(field, FALSE);
purple_request_field_group_add_field(group, field);
+ field = purple_request_field_string_new("uin",
+ _("UIN"), NULL, FALSE);
+ purple_request_field_string_set_masked(field, FALSE);
+ purple_request_field_group_add_field(group, field);
+
field = purple_request_field_string_new("city",
_("City"), NULL, FALSE);
purple_request_field_string_set_masked(field, FALSE);

323
pidgin.spec
View file

@ -1,6 +1,6 @@
%if %mandriva_branch == Cooker
# Cooker
%define release %mkrel 2
%define release %mkrel 1
%else
# Old distros
%define subrel 1
@ -27,6 +27,10 @@
%define build_mono 0
%endif
%if %mdvver < 201020
%define build_vv 0
%endif
%{?_without_evolution: %{expand: %%global build_evolution 0}}
%{?_with_evolution: %{expand: %%global build_evolution 1}}
@ -47,7 +51,7 @@
Summary: A GTK+ based multiprotocol instant messaging client
Name: pidgin
Version: 2.9.0
Version: 2.10.1
Release: %release
Group: Networking/Instant messaging
License: GPLv2+
@ -63,7 +67,7 @@ Patch3: pidgin-2.4.2-set-jabber-as-module.patch
Patch6: pidgin-2.7.0-mono-build.patch
#gw fix reading resolv.conf in NetworkManager integration
Patch111: %{name}-2.8.0-reread-resolvconf.patch
Patch115: %{name}-2.3.1-gg-search-by-uin.patch
Patch115: %{name}-2.10.0-gg-search-by-uin.patch
Patch116: %{name}-2.8.0-gg-disconnect.patch
BuildRequires: automake
BuildRequires: intltool
@ -320,7 +324,7 @@ This package contains translation files for Pidgin/Finch.
%patch3 -p0
%patch6 -p1
%patch111 -p1 -b .reread-resolvconf
%patch115 -p1
%patch115 -p1 -b .gg-search
%patch116 -p1
%build
@ -552,7 +556,25 @@ rm -rf %{buildroot}
%changelog
* Mon Jun 27 2011 Sergey Zhemoitel <serg@mandriva.org> 2.9.0-2mdv2011.0
* Thu Dec 08 2011 Oden Eriksson <oeriksson@mandriva.com> 2.10.1-0.1
- 2.10.1
* Sat Sep 17 2011 Oden Eriksson <oeriksson@mandriva.com> 2.10.0-0.1
- built for updates
* Tue Sep 06 2011 Oden Eriksson <oeriksson@mandriva.com> 2.10.0-3mdv2012.0
+ Revision: 698448
- make it backportable again
* Mon Aug 22 2011 Götz Waschk <waschk@mandriva.org> 2.10.0-2
+ Revision: 696147
- update patch 115 and reenable patches
+ Sergey Zhemoitel <serg@mandriva.org>
- off all patchs
- new release 2.10.0
* Mon Jun 27 2011 Sergey Zhemoitel <serg@mandriva.org> 2.9.0-2
+ Revision: 687464
- import source new version
- new version 2.9.0
@ -684,7 +706,7 @@ rm -rf %{buildroot}
- don't build evolution plugin on Cooker
- prepare for backports
+ Olivier Blin <oblin@mandriva.com>
+ Olivier Blin <blino@mandriva.org>
- bump release
- default to xdg-open to open links (instead of inexistent mozilla)
@ -919,7 +941,7 @@ rm -rf %{buildroot}
* Sat Jun 07 2008 Tomasz Pawel Gajc <tpg@mandriva.org> 2.4.2-6mdv2009.0
+ Revision: 216736
- Patch117: add initial support for sending images for Gadu-Gadu (upstream bug #220, thanks goes to Tomasz Sa?\179aci?\241ski)
- Patch117: add initial support for sending images for Gadu-Gadu (upstream bug #220, thanks goes to Tomasz S.
* Sun Jun 01 2008 Funda Wang <fwang@mandriva.org> 2.4.2-5mdv2009.0
+ Revision: 214118
@ -1001,7 +1023,7 @@ rm -rf %{buildroot}
+ Revision: 152757
- seaching people by uin on Gadu-Gadu network is broken, fixing this with patch 115
+ Olivier Blin <oblin@mandriva.com>
+ Olivier Blin <blino@mandriva.org>
- restore BuildRoot
+ Thierry Vignaud <tv@mandriva.org>
@ -1145,288 +1167,3 @@ rm -rf %{buildroot}
- gaim now names pidgin
- gaim now names pidgin
* Thu Feb 01 2007 Götz Waschk <waschk@mandriva.org> 2.0.0-2.beta6.2mdv2007.0
+ Revision: 115818
- fix mono example plugins and reenable mono support
- fix deps between the subpackages, as long as it is a prerelease
* Fri Jan 19 2007 Götz Waschk <waschk@mandriva.org> 1:2.0.0-2.beta6.1mdv2007.1
+ Revision: 110627
- new version
- disable mono, it currently does not build
- drop patches 104, 105, 106, 107, 108, 110, 112, 150, 152, 153
- add new plugins
* Wed Jan 10 2007 Götz Waschk <waschk@mandriva.org> 1:2.0.0-2.beta5.6mdv2007.1
+ Revision: 107128
- port a few bug fixes from Fedora
* Fri Dec 01 2006 Pascal Terjan <pterjan@mandriva.org> 1:2.0.0-2.beta5.5mdv2007.1
+ Revision: 89504
- Drop the threads patch, it is now initialized correctly, and initializing it twice now aborts
* Wed Nov 29 2006 Götz Waschk <waschk@mandriva.org> 1:2.0.0-2.beta5.4mdv2007.1
+ Revision: 88289
- bot rebuild
- fix buildrequires
- rebuild
* Sat Nov 11 2006 Götz Waschk <waschk@mandriva.org> 1:2.0.0-2.beta5.1mdv2007.0
+ Revision: 81050
- new version
- readd source signature
- update file list
* Sat Oct 21 2006 Götz Waschk <waschk@mandriva.org> 1:2.0.0-2.beta4.2mdv2007.1
+ Revision: 71560
- readd dbus thread fix
* Fri Oct 20 2006 Götz Waschk <waschk@mandriva.org> 1:2.0.0-2.beta4.1mdv2007.1
+ Revision: 71292
- Import gaim
* Fri Oct 20 2006 Götz Waschk <waschk@mandriva.org> 2.0.0-2.beta4.1mdv2007.1
- fix buildrequires
- drop patch 1
- unpack patch
- new version
* Wed Aug 23 2006 Pascal Terjan <pterjan@mandriva.com> 1:2.0.0-2.beta3.1.1mdv2007.0
- Beta 3.1...
* Tue Aug 15 2006 Götz Waschk <waschk@mandriva.org> 2.0.0-1.beta3.12mdv2007.0
- fix buildrequires
* Sun Aug 13 2006 Pascal Terjan <pterjan@mandriva.com> 1:2.0.0-1.beta3.11mdv2007.0
- Initialize threads as gnomevfs now uses dbus (P1)
* Thu Aug 03 2006 Frederic Crozat <fcrozat@mandriva.com> 1:2.0.0-1.beta3.9mdv2007.0
- Rebuild with latest dbus
* Wed Jul 26 2006 Götz Waschk <waschk@mandriva.org> 2.0.0-1.beta3.8mdv2007.0
- rebuild for new e-d-s
* Sun Jul 16 2006 Nicolas Lécureuil <neoclust@mandriva.org> 1:2.0.0-0.beta3.7mdv2007.0
- XDG menu
* Tue May 02 2006 Götz Waschk <waschk@mandriva.org> 2.0.0-0.beta3.6mdk
- rebuild
* Wed Apr 19 2006 Götz Waschk <waschk@mandriva.org> 2.0.0-0.beta3.5mdk
- build the mono package
* Fri Apr 14 2006 Götz Waschk <waschk@mandriva.org> 2.0.0-0.beta3.4mdk
- add mono package
* Thu Apr 13 2006 Götz Waschk <waschk@mandriva.org> 2.0.0-0.beta3.3mdk
- rebuild for new e-d-s
* Fri Mar 31 2006 Götz Waschk <waschk@mandriva.org> 2.0.0-0.beta3.2mdk
- fix buildrequires
* Thu Mar 30 2006 Götz Waschk <waschk@mandriva.org> 2.0.0-0.beta3.1mdk
- drop patch 1
- new version
* Tue Feb 14 2006 Götz Waschk <waschk@mandriva.org> 2.0.0-0.beta2.3mdk
- patch for new libortp, but disable vv
* Wed Jan 25 2006 Götz Waschk <waschk@mandriva.org> 2.0.0-0.beta2.2mdk
- rebuild for new dbus
* Tue Jan 24 2006 Götz Waschk <waschk@mandriva.org> 2.0.0-0.beta2.1mdk
- update patch 0
- fix buildrequires
- new version
* Mon Jan 02 2006 Pascal Terjan <pterjan@mandriva.org> 1:2.0.0-0.beta1.5mdk
- fix dbus-example.so belonging to 2 subpackages
* Sun Jan 01 2006 Oden Eriksson <oeriksson@mandriva.com> 1:2.0.0-0.beta1.4mdk
- rebuilt against soname aware deps (tcl/tk)
- fix deps
* Sat Dec 24 2005 Pascal Terjan <pterjan@mandriva.org> 1:2.0.0-0.beta1.3mdk
- fix missing %%
- don't build dbus and meanwhile on <= 2006.0
- BuildRequires doxygen for documentation (thanx misc for the reports)
* Thu Dec 22 2005 Pascal Terjan <pterjan@mandriva.org> 1:2.0.0-0.beta1.2mdk
- Change libgaimremote to libgaim-client
- Buildconflicts with stuff we can't disable in configure
* Sun Dec 18 2005 Pascal Terjan <pterjan@mandriva.org> 1:2.0.0-0.beta1.1mdk
- 2.0.0 beta 1
- Drop patch1
- Drop patch2 (nas support no longer exists)
- Add Bonjour subpackage
- meanwhile is now included
* Sun Oct 09 2005 Pascal Terjan <pterjan@mandriva.org> 1:1.5.0-5mdk
- Rebuild for new evolution-data-server
* Fri Sep 02 2005 Christiaan Welvaart <cjw@daneel.dyndns.org> 1.5.0-4mdk
- add BuildRequires: gettext-devel
* Thu Sep 01 2005 Gwenole Beauchesne <gbeauchesne@mandriva.com> 1.5.0-3mdk
- fix build with nas support
* Sat Aug 13 2005 Buchan Milne <bgmilne@linux-mandrake.com> 1.5.0-2mdk
- use %%mkrel
* Sat Aug 13 2005 Pascal Terjan <pterjan@mandriva.org> 1:1.5.0-1mdk
- 1.5.0
* Sat Jul 09 2005 Pascal Terjan <pterjan@mandriva.org> 1:1.4.0-1mdk
- 1.4.0
* Tue Jul 05 2005 Pascal Terjan <pterjan@mandriva.org> 1:1.3.1-3mdk
- Don't duplicate libsilcgaim.so in main package and -silc
* Sat Jun 18 2005 Andreas Hasenack <andreas@mandriva.com> 1:1.3.1-2mdk
- rebuilt without krb4 support
* Sun Jun 12 2005 Pascal Terjan <pterjan@mandriva.org> 1:1.3.1-1mdk
- 1.3.1
* Fri Jun 10 2005 Buchan Milne <bgmilne@linux-mandrake.com> 1.3.0-3mdk
- Rebuild for libkrb53-devel 1.4.1
* Sat May 21 2005 Buchan Milne <bgmilne@linux-mandrake.com> 1.3.0-2mdk
- Rebuild for new libperl.so
* Thu May 12 2005 Pascal Terjan <pterjan@mandriva.org> 1:1.3.0-1mdk
- 1.3.0 (fix CAN-2005-1261 and CAN-2005-1262)
* Tue May 03 2005 Pascal Terjan <pterjan@mandriva.org> 1:1.2.1-4mdk
- Rebuild for new silc
* Sat Apr 23 2005 Pascal Terjan <pterjan@mandriva.org> 1:1.2.1-3mdk
- Fix for gcc4
* Fri Apr 22 2005 Pascal Terjan <pterjan@mandriva.org> 1:1.2.1-2mdk
- Rebuild for new evolution-data-server
* Sat Apr 16 2005 Pascal Terjan <pterjan@mandrake.org> 1:1.2.1-1mdk
- New release 1.2.1
* Mon Mar 21 2005 Pascal Terjan <pterjan@mandrake.org> 1:1.1.4-3mdk
- Get a release number greater than the one from updates
- Requires on release
* Tue Mar 01 2005 Pascal Terjan <pterjan@mandrake.org> 1.1.4-2mdk
- Fix rebuilding on <= 10.0
* Sun Feb 27 2005 Pascal Terjan <pterjan@mandrake.org> 1.1.4-1mdk
- New release 1.1.4
* Sat Feb 26 2005 Abel Cheung <deaddog@mandrake.org> 1.1.3-2mdk
- Append QQ theme to default theme
* Sat Feb 19 2005 Pascal Terjan <pterjan@mandrake.org> 1.1.3-1mdk
- New release 1.1.3
* Sat Feb 19 2005 Pascal Terjan <pterjan@mandrake.org> 1.1.2-2mdk
- Rebuild
* Fri Jan 21 2005 Pascal Terjan <pterjan@mandrake.org> 1.1.2-1mdk
- 1.1.2
* Tue Dec 28 2004 Pascal Terjan <pterjan@mandrake.org> 1.1.1-1mdk
- 1.1.1
* Sun Dec 05 2004 Pascal Terjan <pterjan@mandrake.org> 1.1.0-1mdk
- 1.1.0
* Mon Nov 15 2004 Pascal Terjan <pterjan@mandrake.org> 1.0.3-2mdk
- rebuild for new perl
* Fri Nov 12 2004 Pascal Terjan <pterjan@mandrakesoft.com> 1.0.3-1mdk
- New release 1.0.3
* Wed Oct 27 2004 Abel Cheung <deaddog@mandrake.org> 1.0.2-2mdk
- Adds SILC support
- Use UTF-8 for spec file
- Remove patch1; festival plugin splitted from gaim, to simplify build
- Re-enable kerberos for zephyr
- Corrected devel package requirement
- Reorganize docs
* Thu Oct 21 2004 Pascal Terjan <pterjan@mandrake.org> 1.0.2-1mdk
- New release 1.0.2
* Tue Sep 14 2004 Christiaan Welvaart <cjw@daneel.dyndns.org> 0.82.1-2mdk
- add BuildRequires: libnss-devel libnspr-devel (for MSN support)
* Mon Aug 30 2004 Pascal Terjan <pterjan@mandrake.org> 0.82.1-1mdk
- 0.82.1
* Fri Aug 27 2004 Pascal Terjan <pterjan@mandrake.org> 0.82-1mdk
- 0.82
* Fri Aug 27 2004 Pascal Terjan <pterjan@mandrake.org> 0.81-3mdk
- security fix
* Sat Aug 21 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.81-2mdk
- Rebuild with new menu
* Mon Jul 19 2004 Pascal Terjan <pterjan@mandrake.org> 0.81-1mdk
- 0.81
* Mon Jul 19 2004 Pascal Terjan <pterjan@mandrake.org> 0.80-1mdk
- 0.80
- updated patch0
* Sun Jul 18 2004 Pascal Terjan <pterjan@mandrake.org> 0.79-4mdk
- rebuild for new evolution data server
* Wed Jun 30 2004 Per Øyvind Karlsen <peroyvind@linux-mandrake.com> 0.79-3mdk
- fix buildrequires
* Tue Jun 29 2004 Pascal Terjan <pterjan@mandrake.org> 0.79-2mdk
- put .h for gaim in gaim-devel, not libgaimremote-devel
* Tue Jun 29 2004 Pascal Terjan <pterjan@mandrake.org> 0.79-1mdk
- 0.79
- move gaim-encryption to a separate package
- add a -devel package
- gaim-festival 0.78
* Fri Jun 11 2004 Pascal Terjan <pterjan@mandrake.org> 0.78-4mdk
- Rebuild for evolution-data-server
* Fri Jun 04 2004 Pascal Terjan <pterjan@mandrake.org> 0.78-3mdk
- Allow rebuilding on stable version
* Tue Jun 01 2004 Abel Cheung <deaddog@deaddog.org> 0.78-2mdk
- More epoch fixes
- Enable and split tcl plugin
- Drop source100, use ImageMagick to convert icons
- Don't remove locale, en_CA is valid!
- Update festival plugin
* Tue Jun 01 2004 Pascal Terjan <pterjan@mandrake.org> 0.78-1mdk
- gaim-encryption 2.26
- stop removing libtoolize
- fix invalid-lc-messages-dir (en_CA)
- 0.78
* Sat May 01 2004 Pascal Terjan <pterjan@mandrake.org> 0.77-2mdk
- gaim-encryption 2.25 to fix plugin loading due to API mismatch
- gaim festival 0.77 (Does not fix API mismatch :( )
* Sat Apr 24 2004 Pascal Terjan <pterjan@mandrake.org> 0.77-1mdk
- 0.77
- move gevolution plugin into a separate package
* Sun Apr 04 2004 Pascal Terjan <pterjan@mandrake.org> 0.76-1mdk
- 0.76
- drop Patch2
* Wed Feb 25 2004 Pascal Terjan <pterjan@mandrake.org> 0.75-5mdk
- add missing Epoch in libgaim-remote0-devel Require
* Tue Feb 24 2004 Pascal Terjan <pterjan@mandrake.org> 0.75-4mdk
- use epoch in subpackages Requires