[pidgin/f15: 2/2] Merge branch 'master' into f15
by Stu Tomlinson
commit 4b193431c29f78fcc6cb556068ad97e669cda937
Merge: 74dacc2 c25745a
Author: Stu Tomlinson <stu(a)nosnilmot.com>
Date: Fri Jul 1 01:33:42 2011 +0100
Merge branch 'master' into f15
pidgin-2.8.0-gevolution-compilefix.patch | 20 --------------------
1 files changed, 0 insertions(+), 20 deletions(-)
---
8Â years, 5Â months
[pidgin] remove obsolete patch
by Stu Tomlinson
commit c25745a25e21a1145dc1fab4ea200b5f1ca92c0b
Author: Stu Tomlinson <stu(a)nosnilmot.com>
Date: Fri Jul 1 01:33:42 2011 +0100
remove obsolete patch
pidgin-2.8.0-gevolution-compilefix.patch | 20 --------------------
1 files changed, 0 insertions(+), 20 deletions(-)
8Â years, 5Â months
[pidgin/f14: 2/2] Merge branch 'master' into f14
by Stu Tomlinson
commit dab4ab4210938640dc524335bd034655b0ef3a0c
Merge: 0941efb cf607de
Author: Stu Tomlinson <stu(a)nosnilmot.com>
Date: Fri Jul 1 01:32:17 2011 +0100
Merge branch 'master' into f14
pidgin.spec | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
---
8Â years, 5Â months
[pidgin/f15: 2/2] Merge branch 'master' into f15
by Stu Tomlinson
commit 74dacc2a80f49c914ebf005ff503320591446e2e
Merge: c7e436b cf607de
Author: Stu Tomlinson <stu(a)nosnilmot.com>
Date: Fri Jul 1 01:31:38 2011 +0100
Merge branch 'master' into f15
pidgin.spec | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
---
8Â years, 5Â months
[pidgin] remove no longer needed patch to fix build
by Stu Tomlinson
commit cf607de5b56e67014add4dfd35dba1f2dd73d059
Author: Stu Tomlinson <stu(a)nosnilmot.com>
Date: Fri Jul 1 01:30:21 2011 +0100
remove no longer needed patch to fix build
pidgin.spec | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/pidgin.spec b/pidgin.spec
index abfe5ac..a43aab2 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -135,7 +135,6 @@ Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
## Patches 100+: To be Included in Future Upstream
Patch100: pidgin-2.7.7-msn-disable-msnp16.patch
Patch101: nm09-more.patch
-Patch102: pidgin-2.8.0-gevolution-compilefix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Summary: A Gtk+ based multiprotocol instant messaging client
@@ -419,8 +418,6 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
# http://developer.pidgin.im/ticket/13859
%patch101 -p1 -b .nm09more
-# http://developer.pidgin.im/viewmtn/revision/info/aebefd6d98382ce0f7b42b41...
-%patch102 -p0 -b .gevocompile
# Our preferences
cp %{SOURCE1} prefs.xml
8Â years, 5Â months