diff --git a/pidgin-2.5.8.tar.bz2 b/pidgin-2.5.8.tar.bz2 deleted file mode 100644 index 642a891..0000000 --- a/pidgin-2.5.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f79da1f127dd05f9404494ebc794f8cda919764fd2424f79df31f3b0f9dfd21 -size 8246538 diff --git a/pidgin-2.6.1.tar.bz2 b/pidgin-2.6.1.tar.bz2 new file mode 100644 index 0000000..27cda29 --- /dev/null +++ b/pidgin-2.6.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8f14ce127ea614ad4872eacfda5666090dcae122a2a6d79b6725fbbe7f9bf83 +size 8964827 diff --git a/pidgin-fix-installation.patch b/pidgin-fix-installation.patch deleted file mode 100644 index 7e1404a..0000000 --- a/pidgin-fix-installation.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ura pidgin-2.5.7/pidgin/Makefile.am pidgin-2.5.7/pidgin/Makefile.am ---- pidgin-2.5.7/pidgin/Makefile.am 2009-06-21 00:34:34.000000000 +0200 -+++ pidgin-2.5.7/pidgin/Makefile.am 2009-06-22 22:24:05.500609501 +0200 -@@ -132,8 +132,6 @@ - gtkcellrendererprogress.h \ - gtkcellview.h \ - gtkcellviewmenuitem.h \ -- gtkcellview.h \ -- gtkcellviewmenuitem.h \ - gtkcertmgr.h \ - pidgincombobox.h \ - gtkconn.h \ diff --git a/pidgin.changes b/pidgin.changes index 6868d1c..5341570 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Aug 25 18:07:03 CEST 2009 - sbrabec@suse.cz + +- Updated to version 2.6.1: + * Voice and Video support. + * Theme support. + * Yahoo: Separate plugin for Yahoo Japan, SMS support. + * XMPP: voice and video support, service discovery, support for + BOSH, idle time reporting, attention support, in-band bytestreams + file transfer as, custom smiley support, updated support for buddy + icons. + * Support for IDN. + * Several security fixes (CORE-2009-0727, CVE-2009-2694, + bnc#527100). + ------------------------------------------------------------------- Fri Aug 7 03:04:45 CEST 2009 - vuntz@novell.com diff --git a/pidgin.spec b/pidgin.spec index ac3105f..c8e2e77 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -1,5 +1,5 @@ # -# spec file for package pidgin (Version 2.5.8) +# spec file for package pidgin (Version 2.6.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,8 +20,8 @@ Name: pidgin Summary: GTK+-Based Multiprotocol Instant Messaging Client -Version: 2.5.8 -Release: 2 +Version: 2.6.1 +Release: 1 License: GPL v2 or later Group: Productivity/Networking/Instant Messenger Url: http://www.pidgin.im/ @@ -40,19 +40,19 @@ Patch11: pidgin-directconn-argfix.patch Patch12: pidgin-dbus-invalid-gpointer.patch # PATCH-FIX-OPENSUSE pidgin-browser-default.patch bnc472219 sbrabec@suse.cz - Use xdg-open as default browser. Patch13: pidgin-browser-default.patch -# PATCH-FIX-UPSTREAM: pidgin-fix-installation.patch claes.backstrom@gmail.com - Do not install gtkcellview.h and gtkcellviewmenuitem.h twice -Patch14: pidgin-fix-installation.patch # Can use external libzephyr BuildRequires: cyrus-sasl-devel BuildRequires: dbus-1-devel BuildRequires: doxygen BuildRequires: evolution-data-server-devel +BuildRequires: farsight2-devel BuildRequires: gnome-keyring-devel BuildRequires: graphviz BuildRequires: gtk-doc BuildRequires: gtkspell-devel BuildRequires: intltool BuildRequires: libbonobo-devel +BuildRequires: libidn-devel BuildRequires: libgadu-devel BuildRequires: libstdc++-devel BuildRequires: libxml2-devel @@ -72,7 +72,8 @@ BuildRequires: tk-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: NetworkManager-devel -BuildRequires: gstreamer010-devel +BuildRequires: gstreamer-0_10-devel +BuildRequires: gstreamer-0_10-plugins-base-devel BuildRequires: dbus-1-glib-devel BuildRequires: silc-toolkit-devel BuildRequires: fdupes libnotify-devel @@ -226,16 +227,14 @@ translation-update-upstream %patch11 -p1 %patch12 %patch13 -%patch14 -p1 # Change Myanmar/Myanmar to Myanmar: rename my_MM my po/my_MM.* %{__sed} -i "/^ALL_LINGUAS/s/ my_MM / my /" configure.ac %build -# -fno-strict-aliasing needed for 2.0.0 -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 CFLAGS="$RPM_OPT_FLAGS -fstack-protector -fPIC" +export CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector -fPIC" +export FFLAGS="$RPM_OPT_FLAGS -fstack-protector -fPIC" export LDFLAGS="-pie" ACLOCAL="aclocal -I m4macros" autoreconf -f -i intltoolize --force @@ -250,7 +249,6 @@ intltoolize --force --enable-nm=yes\ --enable-dbus=yes\ --enable-devhelp\ - --with-perl-lib=%{_prefix}\ --with-tclconfig=%{_libdir}\ --with-tkconfig=%{_libdir}\ --with-system-ssl-certs=/etc/ssl/certs @@ -260,27 +258,29 @@ intltoolize --force %install %{makeinstall} -%perl_process_packlist +%{perl_process_packlist} %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 +%{__rm} -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod +%{__rm} -f $RPM_BUILD_ROOT%{_prefix}/lib/perl*/*/perllocal.pod # 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/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} -# 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 /tcl.so | \ %{__grep} -v ".dll$" > %{name}-%{version}-purpleplugins -find $RPM_BUILD_ROOT%{_libdir}/pidgin -xtype f -print | \ +find $RPM_BUILD_ROOT%{_libdir}/pidgin -maxdepth 1 -xtype f -print | \ %{__sed} "s@^$RPM_BUILD_ROOT@@g" > %{name}-%{version}-pidginplugins -find $RPM_BUILD_ROOT%{_libdir}/finch -xtype f -print | \ +find $RPM_BUILD_ROOT%{_libdir}/finch -maxdepth 1 -xtype f -print | \ %{__sed} "s@^$RPM_BUILD_ROOT@@g" > %{name}-%{version}-finchplugins %find_gconf_schemas %{__cat} %{name}.schemas_list %{name}-%{version}-pidginplugins >%{name}.lst @@ -307,21 +307,19 @@ find $RPM_BUILD_ROOT%{_libdir}/finch -xtype f -print | \ %defattr(-,root,root) %doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README README.MTN doc/the_penguin.txt %dir %{_libdir}/pidgin -%{perl_vendorarch}/Pidgin.pm -%{perl_vendorarch}/auto/Pidgin +%{_libdir}/pidgin/perl %{_bindir}/pidgin %{_datadir}/pixmaps/pidgin %{_datadir}/icons/hicolor/*/apps/pidgin.* %{_datadir}/applications/*.desktop %{_datadir}/sounds/purple %doc %{_mandir}/man1/pidgin.* -%doc %{_mandir}/man3/Pidgin.* -/var/adm/perl-modules/pidgin %files devel %defattr(-,root,root) %{_includedir}/pidgin %{_libdir}/pkgconfig/pidgin.pc +%doc %{_mandir}/man3/Pidgin.* %files -n libpurple-lang -f %{name}.lang @@ -337,8 +335,7 @@ find $RPM_BUILD_ROOT%{_libdir}/finch -xtype f -print | \ %{_libdir}/libpurple.so.* %{_libdir}/libpurple-client.so.* %dir %{_libdir}/purple-2 -%{perl_vendorarch}/Purple.pm -%{perl_vendorarch}/auto/Purple +%{_libdir}/purple-2/perl %files -n libpurple-meanwhile %defattr(-, root, root)