diff --git a/.cvsignore b/.cvsignore index bc01baf..76e04db 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pidgin-2.6.5.tar.bz2 +pidgin-2.6.6devel.tar.bz2 diff --git a/pidgin-2.6.5-old-gcc.patch b/pidgin-2.6.5-old-gcc.patch deleted file mode 100644 index 78bc361..0000000 --- a/pidgin-2.6.5-old-gcc.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -urN pidgin-2.6.5.orig/finch/gntaccount.c pidgin-2.6.5/finch/gntaccount.c ---- pidgin-2.6.5.orig/finch/gntaccount.c 2010-01-01 18:28:01.000000000 -0500 -+++ pidgin-2.6.5/finch/gntaccount.c 2010-01-08 18:04:57.835401000 -0500 -@@ -23,6 +23,8 @@ - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - */ -+#include -+ - #include - #include - #include -@@ -36,7 +38,6 @@ - #include - - #include "finch.h" --#include - - #include - #include -diff -urN pidgin-2.6.5.orig/finch/gntdebug.c pidgin-2.6.5/finch/gntdebug.c ---- pidgin-2.6.5.orig/finch/gntdebug.c 2009-08-19 17:56:52.000000000 -0400 -+++ pidgin-2.6.5/finch/gntdebug.c 2010-01-08 18:22:07.434605000 -0500 -@@ -23,6 +23,8 @@ - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - */ -+#include -+ - #include - #include - #include -@@ -35,7 +37,6 @@ - - #include "gntdebug.h" - #include "finch.h" --#include - #include "notify.h" - #include "util.h" - -diff -urN pidgin-2.6.5.orig/finch/gntnotify.c pidgin-2.6.5/finch/gntnotify.c ---- pidgin-2.6.5.orig/finch/gntnotify.c 2009-08-19 17:56:52.000000000 -0400 -+++ pidgin-2.6.5/finch/gntnotify.c 2010-01-08 18:54:17.812859000 -0500 -@@ -23,6 +23,8 @@ - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - */ -+#include -+ - #include - #include - #include -@@ -32,7 +34,6 @@ - #include - - #include "finch.h" --#include - - #include - -diff -urN pidgin-2.6.5.orig/finch/gntplugin.c pidgin-2.6.5/finch/gntplugin.c ---- pidgin-2.6.5.orig/finch/gntplugin.c 2009-08-19 17:56:52.000000000 -0400 -+++ pidgin-2.6.5/finch/gntplugin.c 2010-01-08 19:39:48.233494000 -0500 -@@ -23,6 +23,8 @@ - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - */ -+#include -+ - #include - #include - #include -@@ -32,7 +34,6 @@ - #include - - #include "finch.h" --#include - - #include "debug.h" - #include "notify.h" -diff -urN pidgin-2.6.5.orig/finch/gntpounce.c pidgin-2.6.5/finch/gntpounce.c ---- pidgin-2.6.5.orig/finch/gntpounce.c 2009-08-19 17:56:52.000000000 -0400 -+++ pidgin-2.6.5/finch/gntpounce.c 2010-01-08 18:39:35.523268000 -0500 -@@ -24,6 +24,8 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * - */ -+#include -+ - #include - #include - #include -@@ -36,7 +38,6 @@ - #include - - #include "finch.h" --#include - - #include "account.h" - #include "conversation.h" diff --git a/pidgin.spec b/pidgin.spec index 19c3520..b8cd613 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -97,15 +97,16 @@ %endif Name: pidgin -Version: 2.6.5 -Release: 2%{?dist} +Version: 2.6.6 +Release: 0.1%{?dist} License: GPLv2+ and GPLv2 and MIT # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls # GPLv2 - silc & novell prpls # MIT - Zephyr prpl Group: Applications/Internet URL: http://pidgin.im/ -Source0: http://downloads.sourceforge.net/pidgin/pidgin-%{version}.tar.bz2 +#Source0: http://downloads.sourceforge.net/pidgin/pidgin-%{version}.tar.bz2 +Source0: pidgin-2.6.6devel.tar.bz2 Obsoletes: gaim < 999:1 Provides: gaim = 999:1 ExcludeArch: s390 s390x @@ -130,7 +131,7 @@ Source1: purple-fedora-prefs.xml Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch ## Patches 100+: To be Included in Future Upstream -Patch100: pidgin-2.6.5-old-gcc.patch +#Patch100: pidgin-2.6.5-old-gcc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Summary: A Gtk+ based multiprotocol instant messaging client @@ -385,14 +386,15 @@ Doxygen generated API documentation. %prep echo "FEDORA=%{fedora} RHEL=%{rhel}" -%setup -q +#%setup -q +%setup -n pidgin-2.6.6devel -q ## Patches 0-99: Fedora specific or upstream wont accept %if %{force_sound_aplay} %patch0 -p1 -b .aplay %endif ## Patches 100+: To be Included in Future Upstream -%patch100 -p1 -b .old_gcc +#%patch100 -p1 -b .old_gcc # Our preferences cp %{SOURCE1} prefs.xml @@ -402,6 +404,13 @@ if [ "%{use_gnome_open}" == "1" ]; then sed -i "s/value='xdg-open'/value='gnome-open'/" prefs.xml fi +# Bug #528796: Get rid of #!/usr/bin/env python +# Upstream refuses to use ./configure --python-path= in these scripts +# for no good reason. +for file in finch/plugins/pietray.py libpurple/purple-remote libpurple/plugins/dbus-buddyicons-example.py \ + libpurple/plugins/startup.py libpurple/purple-url-handler libpurple/purple-notifications-example; do + sed -i 's/env python/python/' $file +done %build SWITCHES="--with-extraversion=%{release}" @@ -640,6 +649,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Feb 11 2010 Warren Togami - 2.6.6-0.1 +- Bug #528796: Get rid of #!/usr/bin/env python + * Fri Jan 8 2010 Warren Togami - 2.6.5-2 - 2.6.5 - CVE-2010-0013 diff --git a/sources b/sources index 1061cf0..5fbe926 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -90847ed22ec830db5d9768748812b661 pidgin-2.6.5.tar.bz2 +afb07ed21a0fe8f39355530cf4e1e8e6 pidgin-2.6.6devel.tar.bz2