From 6ae73485c8a19320854437220dee4bf76708bee7702644477185fa8f66e21212 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Mon, 14 Feb 2011 00:10:26 +0000 Subject: [PATCH] Accepting request 60677 from GNOME:Apps Accepted submit request 60677 from user vuntz OBS-URL: https://build.opensuse.org/request/show/60677 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=66 --- _service | 2 +- _service:download_url:pidgin-2.7.10.tar.bz2 | 3 + _service:download_url:pidgin-2.7.9.tar.bz2 | 3 - pidgin-dbus-invalid-gpointer.patch | 17 ----- pidgin-fix-perl-build.patch | 24 ++++++ pidgin.changes | 84 +++++++++++++++++++++ pidgin.spec | 35 ++++++--- 7 files changed, 136 insertions(+), 32 deletions(-) create mode 100644 _service:download_url:pidgin-2.7.10.tar.bz2 delete mode 100644 _service:download_url:pidgin-2.7.9.tar.bz2 delete mode 100644 pidgin-dbus-invalid-gpointer.patch create mode 100644 pidgin-fix-perl-build.patch diff --git a/_service b/_service index 0aa2752..5668fe3 100644 --- a/_service +++ b/_service @@ -2,6 +2,6 @@ sourceforge.net http - /projects/pidgin/files/Pidgin/2.7.9/pidgin-2.7.9.tar.bz2/download + /projects/pidgin/files/Pidgin/2.7.10/pidgin-2.7.10.tar.bz2/download diff --git a/_service:download_url:pidgin-2.7.10.tar.bz2 b/_service:download_url:pidgin-2.7.10.tar.bz2 new file mode 100644 index 0000000..0e00e74 --- /dev/null +++ b/_service:download_url:pidgin-2.7.10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:269708d519537d74ff316ff88f5c39e0c04617073a07dce920fa85321586950e +size 9970363 diff --git a/_service:download_url:pidgin-2.7.9.tar.bz2 b/_service:download_url:pidgin-2.7.9.tar.bz2 deleted file mode 100644 index 4a2421a..0000000 --- a/_service:download_url:pidgin-2.7.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9722d7f199a6704e29900c80f270d9409d5c28caab77f495b68108d81ba3e19e -size 9965575 diff --git a/pidgin-dbus-invalid-gpointer.patch b/pidgin-dbus-invalid-gpointer.patch deleted file mode 100644 index aab315d..0000000 --- a/pidgin-dbus-invalid-gpointer.patch +++ /dev/null @@ -1,17 +0,0 @@ -ERROR: pidgin 64bit-portability-issue dbus-bindings.c: 9605 - -dbus-bindings.c: In function 'purple_util_format_song_info_DBUS': -dbus-bindings.c:9605: warning: passing argument 4 of 'purple_util_format_song_info' makes pointer from integer without a cast - -================================================================================ ---- libpurple/dbus-analyze-functions.py -+++ libpurple/dbus-analyze-functions.py -@@ -3,7 +3,7 @@ - import sys - - # types translated into "int" --simpletypes = ["int", "gint", "guint", "gboolean", "gpointer", "size_t", "gssize", "time_t"] -+simpletypes = ["int", "gint", "guint", "gboolean", "size_t", "gssize", "time_t"] - - # List "excluded" contains functions that shouldn't be exported via - # DBus. If you remove a function from this list, please make sure diff --git a/pidgin-fix-perl-build.patch b/pidgin-fix-perl-build.patch new file mode 100644 index 0000000..fbfef24 --- /dev/null +++ b/pidgin-fix-perl-build.patch @@ -0,0 +1,24 @@ +Index: pidgin-2.7.10/libpurple/plugins/perl/common/Makefile.PL.in +=================================================================== +--- pidgin-2.7.10.orig/libpurple/plugins/perl/common/Makefile.PL.in ++++ pidgin-2.7.10/libpurple/plugins/perl/common/Makefile.PL.in +@@ -10,7 +10,6 @@ WriteMakefile( + (ABSTRACT_FROM => '@srcdir@/Purple.pm', # finds $ABSTRACT + AUTHOR => 'Purple ') : ()), + 'DEFINE' => '@DEBUG_CFLAGS@', +- 'dynamic_lib' => { 'OTHERLDFLAGS' => '@LDFLAGS@' }, + 'INC' => '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libpurple @GLIB_CFLAGS@', + 'OBJECT' => '$(O_FILES)', # link all the C files too + # 'OPTIMIZE' => '-g', # For debugging +Index: pidgin-2.7.10/pidgin/plugins/perl/common/Makefile.PL.in +=================================================================== +--- pidgin-2.7.10.orig/pidgin/plugins/perl/common/Makefile.PL.in ++++ pidgin-2.7.10/pidgin/plugins/perl/common/Makefile.PL.in +@@ -9,7 +9,6 @@ WriteMakefile( + ('ABSTRACT_FROM' => '@srcdir@/Pidgin.pm', # finds $ABSTRACT + 'AUTHOR' => 'Pidgin ') : ()), + 'DEFINE' => '@DEBUG_CFLAGS@', +- 'dynamic_lib' => { 'OTHERLDFLAGS' => '@LDFLAGS@' }, + 'INC' => '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libpurple -I@top_srcdir@/pidgin @GTK_CFLAGS@', + 'OBJECT' => '$(O_FILES)', # link all the C files too + 'TYPEMAPS' => ["@top_srcdir@/libpurple/plugins/perl/common/typemap"], diff --git a/pidgin.changes b/pidgin.changes index abd0420..b7a4c25 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,87 @@ +------------------------------------------------------------------- +Sun Feb 13 12:06:29 CET 2011 - vuntz@opensuse.org + +- Add pidgin-fix-perl-build.patch to fix the build: some change + upstream was apparently wrong, and we'll need to investigate this + later. + +------------------------------------------------------------------- +Sat Feb 12 19:42:22 CET 2011 - vuntz@opensuse.org + +- Call relevant macros in %post/%postun: + + %desktop_database_post/postun because the package ships at + least one desktop file. + + %icon_theme_cache_post/postun because the package ships themed + icons. +- Pass %{?no_lang_C} to %find_lang so that english documentation + can be packaged with the program, and not in the lang subpackage. +- Change Requires of lang subpackage to Recommends, since the + english documentation is not there anymore. + +------------------------------------------------------------------- +Thu Feb 02 11:06:57 CET 2011 - christoph.miebach@web.de + +- Update to version 2.7.10 + + General: + - Force video sources to all have the same capabilities. This + reduces the number of times video must be scaled down, saving + CPU time. + - Starting multiple video calls and ending one no longer causes + the other calls to stop sending audio and video. + - Perl bindings now respect LDFLAGS. + - Added AddTrust External Root CA. + - Resolve some issues validating X.509 certificates signed off + the CAcert Class 3 intermediate cert when using the GnuTLS + SSL/TLS plugin. + + Gadu-Gadu: + - Don't drop whole messages when text is colored. + + Groupwise: + - Don't show two windows when using "Get Info" on a buddy. + + IRC: + - Don't send ISON messages longer than 512 bytes. + + libpurple: + - Stop sending audio when placing a call on hold. + - Stop translating gpointers to ints in the dbus API. This + removes functions from the dbus API. + - Fix D-Bus introspection calls that omit the interface + parameter. + - Fixed bugs in purple_str_to_time() that caused the most + recent 'make check' failures. + - Correct an issue that caused some UIs other than Pidgin or + Finch to leave a buddy in the "is typing" state. + - Fix potential information disclosure issues in the Cipher + code. + + Pidgin: + - Support using the Page Up and Page Down keys on the numeric + keypad in the conversation window. + - Fix a few memory leaks. + - Support rendering strikethrough when received as in-line CSS. + - Editable comboboxes are now more friendly to some GTK+ + themes. + + Plugins: + - The Voice/Video Settings plugin no longer resets selected + devices to defaults. + - The Voice/Video Settings plugin no longer crashes when a + stored device name is not found in the list of available + devices. + - The Autoaccept plugin now allows disabling filename escaping. + - The Autoaccept plugin now allows choosing Reject/Ask/Accept + for non-buddies. + + QQ: + - QQ2008 is now the default protocol version. + + XMPP: + - Don't crash when receiving an unexpected/invalid jingle + transport type. + - Handle Connection: Close headers for BOSH, when the server + does not terminate the connection itself. + - Improved parsing for DIGEST-MD5, which should resolve issues + connecting to some jabberd2 servers. This corrects an issue + parsing one-character or empty elements. + + Yahoo!/Yahoo! JAPAN: + - Fix a crash when an account disconnects before a p2p session + is completely set up. +- Drop pidgin-dbus-invalid-gpointer.patch: fixed upstream. + ------------------------------------------------------------------- Mon Dec 27 10:04:57 CET 2010 - dimstar@opensuse.org diff --git a/pidgin.spec b/pidgin.spec index 14cc233..ef6497e 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -1,5 +1,5 @@ # -# spec file for package pidgin (Version 2.7.9) +# spec file for package pidgin (Version 2.7.10) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ Name: pidgin Summary: GTK+-Based Multiprotocol Instant Messaging Client -Version: 2.7.9 +Version: 2.7.10 Release: 1 # FIXME: check resolution of bnc#659001 to decide what to do about ownership of mhr directories in -lang (last checked: 2012-12-21) License: GPLv2+ @@ -38,9 +38,10 @@ Patch1: pidgin-gnome-keyring.patch Patch3: pidgin-nonblock-common.patch Patch4: pidgin-nonblock-gwim.patch Patch5: pidgin-nonblock-common2.patch -Patch12: pidgin-dbus-invalid-gpointer.patch # PATCH-FIX-UPSTREAM pidgin-mono-buildfix.patch http://developer.pidgin.im/ticket/12506 dimstar@opensuse.org -- Fix build with mono plugin loader; missing include statements. Patch14: pidgin-mono-buildfix.patch +# PATCH-FIX-OPENSUSE pidgin-fix-perl-build.patch vuntz@opensuse.org -- Revert http://developer.pidgin.im/viewmtn/revision/info/f32151852a00fb5abd3fdccdd8df2419031666de as it breaks the build +Patch15: pidgin-fix-perl-build.patch # Can use external libzephyr BuildRequires: cyrus-sasl-devel BuildRequires: dbus-1-devel @@ -134,13 +135,13 @@ BuildRequires: libavahi-glib-devel %else BuildRequires: avahi-devel avahi-glib %endif -%if %suse_version > 1030 -Requires: libpurple-lang = %{version} -%endif %if %suse_version > 1020 Requires: openssl-certs %endif Requires: perl-base = %{perl_version} +%if %suse_version > 1030 +Recommends: libpurple-lang +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build # Existed before 10.3 and SLED10 before SP2: Obsoletes: gaim <= 1.5.0 @@ -184,15 +185,15 @@ Summary: Library for IM Clients Like Pidgin and Finch Group: Productivity/Networking/Instant Messenger # Not really required, but standard Jabber accounts require it, if compiled with SASL support. Requires: cyrus-sasl-digestmd5 cyrus-sasl-plain -%if %suse_version > 1030 -Requires: libpurple-lang = %{version} -%endif # Needed for purple-url-handler: Requires: dbus-1-python Requires: perl = %{perl_version} %if %suse_version > 1020 Requires: openssl-certs %endif +%if %suse_version > 1030 +Recommends: libpurple-lang +%endif %package -n libpurple-devel License: GPLv2+ @@ -326,8 +327,8 @@ translation-update-upstream %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch12 %patch14 -p1 +%patch15 -p1 # Change Myanmar/Myanmar to Myanmar: rename my_MM my po/my_MM.* %{__sed} -i "/ALL_LINGUAS/s/ my_MM / my /" configure.ac @@ -387,7 +388,7 @@ test -L $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so && %{__rm} $RPM_BUILD_RO test -L $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so && %{__rm} $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so find $RPM_BUILD_ROOT -type f -name .packlist -exec %{__rm} {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec %{__rm} {} ';' -%find_lang %{name} +%find_lang %{name} %{?no_lang_C} find $RPM_BUILD_ROOT%{_libdir}/purple-2 -xtype f -print | \ %{__sed} "s@^$RPM_BUILD_ROOT@@g" | \ %{__grep} -v /libsametime.so | \ @@ -417,6 +418,18 @@ find $RPM_BUILD_ROOT%{_libdir}/finch -maxdepth 1 -xtype f -print | \ %preun -f %{name}.schemas_preun +%if 0%{?suse_version} > 1130 +%post +%desktop_database_post +%icon_theme_cache_post +%endif + +%if 0%{?suse_version} > 1130 +%postun +%desktop_database_postun +%icon_theme_cache_postun +%endif + %post -n libpurple -p /sbin/ldconfig %postun -n libpurple -p /sbin/ldconfig