diff --git a/pidgin-2.5.1.tar.bz2 b/pidgin-2.5.1.tar.bz2 deleted file mode 100644 index a3544b3..0000000 --- a/pidgin-2.5.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13e87a88b43804be72f8566402afa4c1c3756396aed4ef6b6b9d86d384e75b77 -size 8952067 diff --git a/pidgin-2.5.4.tar.bz2 b/pidgin-2.5.4.tar.bz2 new file mode 100644 index 0000000..f8c0e1c --- /dev/null +++ b/pidgin-2.5.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6bebef97b8b337cd2bc8107b3714dedf60d02db70487d0aafdd8b5b7ada1b63 +size 8398610 diff --git a/pidgin-64bit-buildhack.patch b/pidgin-64bit-buildhack.patch deleted file mode 100644 index 23a6f62..0000000 --- a/pidgin-64bit-buildhack.patch +++ /dev/null @@ -1,41 +0,0 @@ -This patch corrects type casts of universal data item in the generated code. It -is an ugly hack. Generator has to be fixed instead. -================================================================================ ---- libpurple/dbus-bindings.c -+++ libpurple/dbus-bindings.c -@@ -3576,7 +3576,7 @@ - CHECK_ERROR(error_DBUS); - PURPLE_DBUS_ID_TO_POINTER(conv, conv_ID, PurpleConversation, error_DBUS); - key = (key && key[0]) ? key : NULL; -- purple_conversation_set_data(conv, key, data); -+ purple_conversation_set_data(conv, key, GINT_TO_POINTER(data)); - reply_DBUS = dbus_message_new_method_return (message_DBUS); - dbus_message_append_args(reply_DBUS, DBUS_TYPE_INVALID); - return reply_DBUS; -@@ -3593,7 +3593,7 @@ - CHECK_ERROR(error_DBUS); - PURPLE_DBUS_ID_TO_POINTER(conv, conv_ID, PurpleConversation, error_DBUS); - key = (key && key[0]) ? key : NULL; -- RESULT = purple_conversation_get_data(conv, key); -+ RESULT = GINT_TO_POINTER(purple_conversation_get_data(conv, key)); - reply_DBUS = dbus_message_new_method_return (message_DBUS); - dbus_message_append_args(reply_DBUS, DBUS_TYPE_INT32, &RESULT, DBUS_TYPE_INVALID); - return reply_DBUS; -@@ -4741,7 +4741,7 @@ - dbus_int32_t RESULT; - dbus_message_get_args(message_DBUS, error_DBUS, DBUS_TYPE_UINT32, &unused, DBUS_TYPE_INVALID); - CHECK_ERROR(error_DBUS); -- RESULT = purple_core_quit_cb(unused); -+ RESULT = purple_core_quit_cb(GINT_TO_POINTER(unused)); - reply_DBUS = dbus_message_new_method_return (message_DBUS); - dbus_message_append_args(reply_DBUS, DBUS_TYPE_INT32, &RESULT, DBUS_TYPE_INVALID); - return reply_DBUS; -@@ -6479,7 +6479,7 @@ - dbus_message_get_args(message_DBUS, error_DBUS, DBUS_TYPE_STRING, &name, DBUS_TYPE_UINT32, &value, DBUS_TYPE_INVALID); - CHECK_ERROR(error_DBUS); - name = (name && name[0]) ? name : NULL; -- purple_prefs_set_generic(name, value); -+ purple_prefs_set_generic(name, GINT_TO_POINTER(value)); - reply_DBUS = dbus_message_new_method_return (message_DBUS); - dbus_message_append_args(reply_DBUS, DBUS_TYPE_INVALID); - return reply_DBUS; diff --git a/pidgin-po.tar.bz2 b/pidgin-po.tar.bz2 new file mode 100644 index 0000000..f4b9490 --- /dev/null +++ b/pidgin-po.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04c0bcd510ebaa80e1b244713a3860a108f3f3aff33d34e1a9d5e784d184d46b +size 1247562 diff --git a/pidgin.changes b/pidgin.changes index dfc6b8e..92478b7 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,9 +1,67 @@ +------------------------------------------------------------------- +Sun Feb 1 18:13:23 EST 2009 - mboman@suse.de + +- Update to version 2.5.4: + + libpurple + * Fix a connection timeout with empty Gadu-Gady buddy lists + * Don't ignore namespace information when parsing XMPP data + * Fix a crash that occurred when retrieving certain Offline + Messages on MSN. + * Extended purple-url-handler to handle "gtalk" URI's + * Fix the hang on exit in Network Location Awareness for + Windows XP and Windows Vista + + MSN + * Change Contact Server to temporarily fix connection + problems + + XMPP + * Support for XEP-0191 blocking + * Don't put SASL PLAIN or IQ Auth passwords in debug logs + * Fix removal of avatars (both PEP and vCard), we weren't + removing them correctly before + + Pidgin + * Fix a crash in the Add Account dialog when changing + protocols under certain circumstances + + Finch + * Redirect stderr outputs to the debug window + * Fix rebinding actions with the arrow-keys and tab + + Windows-specific changes + * Fix the "Hang on Exit" issue that a number of users + encountered + * Updated GTK+ to 2.14.6 + + Translation updates + +------------------------------------------------------------------- +Sat Jan 24 14:38:38 CET 2009 - vuntz@novell.com + +- Mark pidgin-nonblock-aim.patch as PATCH-NEEDS-REBASE since it's + not applied. +- Remove libao-devel and perl-XML-Parser BuildRequires. +- Remove tests for non-supported versions of openSUSE. +- Don't rename sr@latin to sr@Latn since @latin is the right way. +- Enable parallel build. +- Consolidate removing of la files in one place. +- Recompress pidgin-po.tar.gz with bzip2. +- Remove pidgin-64bit-buildhack.patch which wasn't used anymore. + +------------------------------------------------------------------- +Mon Jan 12 15:25:27 EST 2009 - mauro@suse.de + +- Translations update. + ------------------------------------------------------------------- Tue Jan 6 12:11:13 EST 2009 - jpr@novell.com - Fix keyring patch so the keyring paths actually get used (bnc #327391) +------------------------------------------------------------------- +Wed Dec 31 09:23:03 IST 2008 - msuman@suse.de + +- Update to version 2.5.3: + + Misc. bug fixes + + Custom smileys for the XMPP protocol +- Spec file cleanup for a few RPMLINT warnings. + ------------------------------------------------------------------- Tue Nov 25 10:22:44 CET 2008 - ro@suse.de diff --git a/pidgin.spec b/pidgin.spec index dfc1fae..ff64aeb 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -1,5 +1,5 @@ # -# spec file for package pidgin (Version 2.5.1) +# spec file for package pidgin (Version 2.5.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,21 +20,22 @@ Name: pidgin Summary: GTK+-Based Multiprotocol Instant Messaging Client -Version: 2.5.1 -Release: 4 +Version: 2.5.4 +Release: 1 License: GPL v2 or later Group: Productivity/Networking/Instant Messenger Url: http://www.pidgin.im/ -Source: %{name}-%{version}.tar.bz2 +Source: http://downloads.sourceforge.net/pidgin/%{name}-%{version}.tar.bz2 Source1: pidgin-NLD-smiley-theme.tar.bz2 Source2: pidgin-Tango-smiley-theme.tar.bz2 +Source3: %{name}-po.tar.bz2 Patch1: pidgin-gnome-keyring.patch +# PATCH-NEEDS-REBASE Patch2: pidgin-nonblock-aim.patch Patch3: pidgin-nonblock-common.patch Patch4: pidgin-nonblock-gwim.patch Patch5: pidgin-nonblock-common2.patch Patch9: includes.patch -Patch10: pidgin-64bit-buildhack.patch # PATCH-FIX-UPSTREAM: pidgin-directconn-argfix.patch Patch11: pidgin-directconn-argfix.patch Patch12: pidgin-dbus-invalid-gpointer.patch @@ -48,7 +49,6 @@ BuildRequires: graphviz BuildRequires: gtk-doc BuildRequires: gtkspell-devel BuildRequires: intltool -BuildRequires: libao-devel BuildRequires: libbonobo-devel BuildRequires: libgadu-devel BuildRequires: libstdc++-devel @@ -62,30 +62,14 @@ BuildRequires: ncurses-devel BuildRequires: openssl-certs BuildRequires: pam-devel BuildRequires: pcre-devel -BuildRequires: perl-XML-Parser BuildRequires: python BuildRequires: sqlite-devel BuildRequires: startup-notification-devel BuildRequires: tk-devel BuildRequires: update-desktop-files -# Product specific lines -%if %suse_version >= 1000 || 0%{?opensuse_bs} BuildRequires: NetworkManager-devel -%endif -%if %suse_version == 1010 || 0%{?opensuse_bs} -BuildRequires: NetworkManager-gnome -%endif -%if %suse_version >= 1010 || 0%{?opensuse_bs} BuildRequires: gstreamer010-devel -%else -BuildRequires: gstreamer-devel -%endif -%if %suse_version >= 1011 || 0%{?opensuse_bs} BuildRequires: dbus-1-glib-devel -%else -BuildRequires: dbus-1-glib -%endif -%if %suse_version >= 1021 || 0%{?opensuse_bs} BuildRequires: silc-toolkit-devel BuildRequires: fdupes libnotify-devel %if %suse_version > 1030 || 0%{?opensuse_bs} @@ -93,9 +77,9 @@ BuildRequires: libavahi-glib-devel %else BuildRequires: avahi-devel %endif -%endif Requires: libpurple-lang = %{version} Requires: openssl-certs +Requires: perl-base = %{perl_version} BuildRoot: %{_tmppath}/%{name}-%{version}-build # Existed before 10.3: Obsoletes: gaim <= 1.5.0 @@ -195,11 +179,12 @@ Requires: %{name} = %{version} glib2-devel gtk2-devel libpurple-devel = %{ License: GPL v2 or later 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. +# Not really required, but standard Jabber accounts require it, if compiled with SASL support. Requires: cyrus-sasl-digestmd5 cyrus-sasl-plain Requires: libpurple-lang = %{version} # Needed for purple-url-handler: Requires: dbus-1-python +Requires: perl = %{perl_version} %package -n libpurple-devel License: GPL v2 or later @@ -733,8 +718,7 @@ Authors: %lang_package -n libpurple %prep -#' -%setup -q -a1 -a2 +%setup -q -a1 -a2 -a3 %patch1 -p1 # FIXME: Port this patch: #%patch2 -p1 @@ -746,19 +730,14 @@ Authors: %patch12 # Change Myanmar/Myanmar to Myanmar: rename my_MM my po/my_MM.* -sed -i "/^ALL_LINGUAS/s/ my_MM / my /" configure.ac -# Change sr@latin to sr@Latn - all projects except pidgin and PackageKit use sr@Latn: -rename sr@latin sr@Latn po/sr@latin.* -sed -i "/^ALL_LINGUAS/s/ sr@latin / sr@Latn /" configure.ac +%{__sed} -i "/^ALL_LINGUAS/s/ my_MM / my /" configure.ac %build # -fno-strict-aliasing needed for 2.0.0 -%if %suse_version > 1000 export CFLAGS="$RPM_OPT_FLAGS -fstack-protector -fPIC -fno-strict-aliasing" +export CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector -fPIC -fno-strict-aliasing" +export FFLAGS="$RPM_OPT_FLAGS -fstack-protector -fPIC -fno-strict-aliasing" export LDFLAGS="-pie" -%else -export CFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" -%endif ACLOCAL="aclocal -I m4macros" autoreconf -f -i intltoolize --force %configure\ @@ -772,50 +751,41 @@ intltoolize --force --enable-nm=yes\ --enable-dbus=yes\ --enable-devhelp\ - --with-perl-lib=/usr\ - --with-tclconfig=/usr/%_lib\ - --with-tkconfig=/usr/%_lib\ + --with-perl-lib=%{_prefix}\ + --with-tclconfig=%{_libdir}\ + --with-tkconfig=%{_libdir}\ --with-system-ssl-certs=/etc/ssl/certs -cd libpurple -make dbus-bindings.c -cd .. -#patch -p0 <%{P:10} -make -# Mono bindings 2.1.0 are not parallel build ready: -#make %{?jobs:-j%jobs} +%{__make} %{?jobs:-j%jobs} %install -%makeinstall +%{makeinstall} %perl_process_packlist -%suse_update_desktop_file -N Pidgin -G "Instant Messenger" %{name} InstantMessaging -cp -a NLD $RPM_BUILD_ROOT%{_prefix}/share/pixmaps/pidgin/emotes -cp -a Tango $RPM_BUILD_ROOT%{_prefix}/share/pixmaps/pidgin/emotes -rm $RPM_BUILD_ROOT%{_prefix}/%_lib/pidgin/*.*a +%suse_update_desktop_file -N Pidgin -G "Instant Messenger" %{name} +%{__cp} -a NLD $RPM_BUILD_ROOT%{_datadir}/pixmaps/pidgin/emotes +%{__cp} -a Tango $RPM_BUILD_ROOT%{_datadir}/pixmaps/pidgin/emotes +%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/*/*.la # FIXME: Should be nonversioned name: -test -L $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so && rm $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so -test -L $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so && rm $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so -#find $RPM_BUILD_ROOT -type f -name .packlist -exec rm {} ';' -#find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm {} ';' +test -L $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so && %{__rm} $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so +test -L $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so && %{__rm} $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.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} -rm $RPM_BUILD_ROOT%{_libdir}/*/*.la -# NOTE: Original has also "grep -v /libbonjour.so | \" +# NOTE: Original has also "%{__grep} -v /libbonjour.so | \" find $RPM_BUILD_ROOT%{_libdir}/purple-2 -xtype f -print | \ - sed "s@^$RPM_BUILD_ROOT@@g" | \ - grep -v /libsametime.so | \ - grep -v /mono.so | \ - grep -v ".dll$" > %{name}-%{version}-purpleplugins + %{__sed} "s@^$RPM_BUILD_ROOT@@g" | \ + %{__grep} -v /libsametime.so | \ + %{__grep} -v /mono.so | \ + %{__grep} -v ".dll$" > %{name}-%{version}-purpleplugins find $RPM_BUILD_ROOT%{_libdir}/pidgin -xtype f -print | \ - sed "s@^$RPM_BUILD_ROOT@@g" > %{name}-%{version}-pidginplugins + %{__sed} "s@^$RPM_BUILD_ROOT@@g" > %{name}-%{version}-pidginplugins find $RPM_BUILD_ROOT%{_libdir}/finch -xtype f -print | \ - sed "s@^$RPM_BUILD_ROOT@@g" > %{name}-%{version}-finchplugins + %{__sed} "s@^$RPM_BUILD_ROOT@@g" > %{name}-%{version}-finchplugins %find_gconf_schemas -cat %{name}.schemas_list %{name}-%{version}-pidginplugins >%{name}.lst -# pointless libtool .la file with only trivial dependencies -rm $RPM_BUILD_ROOT%{_libdir}/libpurple.la $RPM_BUILD_ROOT%{_libdir}/libpurple-client.la +%{__cat} %{name}.schemas_list %{name}-%{version}-pidginplugins >%{name}.lst %fdupes $RPM_BUILD_ROOT %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre %posttrans -f %{name}.schemas_posttrans @@ -840,8 +810,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/pidgin %{_datadir}/icons/hicolor/*/apps/pidgin.* %{_datadir}/applications/*.desktop -%dir %{_datadir}/sounds/purple -%{_datadir}/sounds/purple/* +%{_datadir}/sounds/purple %doc %{_mandir}/man1/pidgin.* %doc %{_mandir}/man3/Pidgin.* /var/adm/perl-modules/pidgin @@ -861,6 +830,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/purple-send %{_bindir}/purple-send-async %{_bindir}/purple-url-handler +%{_datadir}/purple %{_libdir}/libpurple.so.* %{_libdir}/libpurple-client.so.* %dir %{_libdir}/purple-2 @@ -901,14 +871,59 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/finch %{_includedir}/gnt %{_libdir}/libgnt.so -%{_libdir}/libgnt.*a %{_libdir}/pkgconfig/finch.pc %{_libdir}/pkgconfig/gnt.pc %changelog +* Sun Feb 01 2009 mboman@suse.de +- Update to version 2.5.4: + + libpurple + * Fix a connection timeout with empty Gadu-Gady buddy lists + * Don't ignore namespace information when parsing XMPP data + * Fix a crash that occurred when retrieving certain Offline + Messages on MSN. + * Extended purple-url-handler to handle "gtalk" URI's + * Fix the hang on exit in Network Location Awareness for + Windows XP and Windows Vista + + MSN + * Change Contact Server to temporarily fix connection + problems + + XMPP + * Support for XEP-0191 blocking + * Don't put SASL PLAIN or IQ Auth passwords in debug logs + * Fix removal of avatars (both PEP and vCard), we weren't + removing them correctly before + + Pidgin + * Fix a crash in the Add Account dialog when changing + protocols under certain circumstances + + Finch + * Redirect stderr outputs to the debug window + * Fix rebinding actions with the arrow-keys and tab + + Windows-specific changes + * Fix the "Hang on Exit" issue that a number of users + encountered + * Updated GTK+ to 2.14.6 + + Translation updates +* Sat Jan 24 2009 vuntz@novell.com +- Mark pidgin-nonblock-aim.patch as PATCH-NEEDS-REBASE since it's + not applied. +- Remove libao-devel and perl-XML-Parser BuildRequires. +- Remove tests for non-supported versions of openSUSE. +- Don't rename sr@latin to sr@Latn since @latin is the right way. +- Enable parallel build. +- Consolidate removing of la files in one place. +- Recompress pidgin-po.tar.gz with bzip2. +- Remove pidgin-64bit-buildhack.patch which wasn't used anymore. +* Mon Jan 12 2009 mauro@suse.de +- Translations update. * Tue Jan 06 2009 jpr@novell.com - Fix keyring patch so the keyring paths actually get used (bnc #327391) +* Tue Dec 30 2008 msuman@suse.de +- Update to version 2.5.3: + + Misc. bug fixes + + Custom smileys for the XMPP protocol +- Spec file cleanup for a few RPMLINT warnings. * Tue Nov 25 2008 ro@suse.de - comment out libpurple2-mono on ppc64 for the moment to fix build (no native mono on ppc64)