rpms/pidgin/devel .cvsignore, 1.37, 1.38 pidgin.spec, 1.109, 1.110 sources, 1.37, 1.38 pidgin-2.6.5-old-gcc.patch, 1.1, NONE

[Warren Togami 砥上勇]

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29597

Modified Files:
	.cvsignore pidgin.spec sources 
Removed Files:
	pidgin-2.6.5-old-gcc.patch 
Log Message:
Bug #528796: Get rid of #!/usr/bin/env python
(and get ready for 2.6.6 release next week)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	8 Jan 2010 20:09:42 -0000	1.37
+++ .cvsignore	11 Feb 2010 22:45:28 -0000	1.38
@@ -1 +1 @@
-pidgin-2.6.5.tar.bz2
+pidgin-2.6.6devel.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- pidgin.spec	9 Jan 2010 01:14:31 -0000	1.109
+++ pidgin.spec	11 Feb 2010 22:45:28 -0000	1.110
@@ -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 <wtogami at redhat.com> - 2.6.6-0.1
+- Bug #528796: Get rid of #!/usr/bin/env python
+
 * Fri Jan  8 2010 Warren Togami <wtogami at redhat.com> - 2.6.5-2
 - 2.6.5
 - CVE-2010-0013


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	8 Jan 2010 20:09:44 -0000	1.37
+++ sources	11 Feb 2010 22:45:28 -0000	1.38
@@ -1 +1 @@
-90847ed22ec830db5d9768748812b661  pidgin-2.6.5.tar.bz2
+afb07ed21a0fe8f39355530cf4e1e8e6  pidgin-2.6.6devel.tar.bz2


--- pidgin-2.6.5-old-gcc.patch DELETED ---