[meego-commits] 5328: Changes to MeeGo:1.0:Netbook:Update:Testing/evolution

[Peter Zhu]

Hi,
I have made the following changes to evolution in project MeeGo:1.0:Netbook:Update:Testing. Please review and accept ASAP.

Thank You,
Peter Zhu

[This message was auto-generated]

---

Request #5328:

  submit:   home:peter:branches:MeeGo:1.0:Netbook:Update:Testing/evolution(r3)(cleanup) -> MeeGo:1.0:Netbook:Update:Testing/evolution


Message:
    Disable socks patch to fix BMC #3667

State:   new          2010-07-04T00:33:42 peter
Comment: None



changes files:
--------------
--- evolution.changes
+++ evolution.changes
@@ -0,0 +1,3 @@
+* Wed Jul 04 2010 Peter Zhu <peter.j.zhu at intel.com> - 2.30.0~20100423
+- Disable socks patch to fix BMC #3667
+

spec files:
-----------
--- evolution.spec
+++ evolution.spec
@@ -82,7 +82,7 @@
 Patch33: evolution-system-nssdb-bug-1510.patch
 Patch34: evolution-composer-transience-bug-1704.patch
 Patch35: evolution-allow-edit-accounts-bug-3286.patch
-Patch36: evolution-camel-socks-proxy-bmo-182.patch
+#Patch36: evolution-camel-socks-proxy-bmo-182.patch
 
 ## Dependencies ###
 
@@ -225,7 +225,7 @@
 %patch33 -p1 -b .evolution-system-nssdb-bug-1510
 %patch34 -p1 -b .evolution-composer-transience-bug-1704
 %patch35 -p1 -b .evolution-allow-edit-accounts-bug-3286
-%patch36 -p1 -b .evolution-camel-socks-proxy-bmo-182
+#%patch36 -p1 -b .evolution-camel-socks-proxy-bmo-182
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib

other changes:
--------------