diff --git a/.abf.yml b/.abf.yml index 501384c..43407ae 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "pidgin-2.10.2.tar.bz2": 5ec0a8a51a9d237f1eaf27bf8858599e8fa6ecce + "pidgin-2.10.3.tar.bz2": 7dfeabdb1ade4311c91ac9c9f988276f67ead6ee diff --git a/pidgin-2.10.2-explicitly-add-soname-to-liboscar-and-libjabber.patch b/pidgin-2.10.2-explicitly-add-soname-to-liboscar-and-libjabber.patch new file mode 100644 index 0000000..33fcfb8 --- /dev/null +++ b/pidgin-2.10.2-explicitly-add-soname-to-liboscar-and-libjabber.patch @@ -0,0 +1,22 @@ +--- pidgin-2.10.2/libpurple/protocols/jabber/Makefile.am.soname~ 2012-03-16 20:23:40.918123912 +0100 ++++ pidgin-2.10.2/libpurple/protocols/jabber/Makefile.am 2012-03-16 20:24:42.355199920 +0100 +@@ -93,7 +93,7 @@ JABBERSOURCES = \ + + AM_CFLAGS = $(st) + +-libjabber_la_LDFLAGS = -module -avoid-version ++libjabber_la_LDFLAGS = -module -avoid-version -Wl,-soname=libjabber.so + libxmpp_la_LDFLAGS = -module -avoid-version + + if USE_CYRUS_SASL +--- pidgin-2.10.2/libpurple/protocols/oscar/Makefile.am.soname~ 2012-03-16 20:15:58.733552100 +0100 ++++ pidgin-2.10.2/libpurple/protocols/oscar/Makefile.am 2012-03-16 20:15:58.753552126 +0100 +@@ -52,7 +52,7 @@ AM_CFLAGS = $(st) + + libaim_la_LDFLAGS = -module -avoid-version + libicq_la_LDFLAGS = -module -avoid-version +-liboscar_la_LDFLAGS = -module -avoid-version ++liboscar_la_LDFLAGS = -module -avoid-version -Wl,-soname=liboscar.so + if STATIC_OSCAR + + st = -DPURPLE_STATIC_PRPL diff --git a/pidgin.spec b/pidgin.spec index 60770c0..61470fd 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -32,7 +32,7 @@ Summary: A GTK+ based multiprotocol instant messaging client Name: pidgin -Version: 2.10.2 +Version: 2.10.3 Release: %mkrel 1 Group: Networking/Instant messaging License: GPLv2+ @@ -51,6 +51,9 @@ Patch111: %{name}-2.8.0-reread-resolvconf.patch Patch115: %{name}-2.10.0-gg-search-by-uin.patch Patch116: %{name}-2.8.0-gg-disconnect.patch Patch117: pidgin-2.10.1-fix-perl-module-build.patch +# since libtool drops soname for unversioned modules now, we need to explicitly +# add soname to plugins that other plugins links against it +Patch118: pidgin-2.10.2-explicitly-add-soname-to-liboscar-and-libjabber.patch BuildRequires: desktop-file-utils BuildRequires: doxygen @@ -79,7 +82,11 @@ BuildRequires: pkgconfig(libstartup-notification-1.0) >= 0.5 Buildrequires: pkgconfig(ncursesw) BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(nspr) +%if %mdkversion >= 201100 Buildrequires: pkgconfig(python) +%else +BuildRequires: python-devel +%endif BuildRequires: pkgconfig(samplerate) BuildRequires: pkgconfig(sm) Buildrequires: pkgconfig(sqlite3) @@ -283,6 +290,7 @@ This package contains translation files for Pidgin/Finch. %patch115 -p1 -b .gg-search %patch116 -p1 %patch117 -p1 -b .perl_buildfix~ +%patch118 -p1 -b .soname~ autoreconf -fi -Im4macros @@ -505,7 +513,16 @@ rm -f %{buildroot}%{_libdir}/*.*a %changelog -* Wed Mar 14 2012 Sergey Zhemoitel 2.10.2-1mdv2012.0 +* Tue Mar 27 2012 Sergey Zhemoitel 2.10.3-1mdv2012.0 ++ Revision: 787438 +- update to 2.10.3 + +* Fri Mar 16 2012 Per Øyvind Karlsen 2.10.2-2 ++ Revision: 785409 +- explicitly add soname to liboscar.so & libjabber.so, since we link other + plugins against them, fixing dependencies generated (P118) + +* Wed Mar 14 2012 Sergey Zhemoitel 2.10.2-1 + Revision: 785022 - release up to 2.10.2