[php/f15/master: 7/7] keep zip extension in f15 for now

[Remi Collet]

commit b607d36c95205ec8c20fb10f9dff55cfb31d1621
Author: remi <fedora at famillecollet.com>
Date:   Thu Mar 17 20:02:30 2011 +0100

    keep zip extension in f15 for now

 php.spec |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/php.spec b/php.spec
index 57b7cd7..0bdd7ff 100644
--- a/php.spec
+++ b/php.spec
@@ -31,8 +31,8 @@
 %endif
 
 # Flip these to 1 and zip respectively to enable zip support again
-%global with_zip 0
-%global zipmod %nil
+%global with_zip 1
+%global zipmod   zip
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
@@ -1048,9 +1048,6 @@ fi
   http://www.php.net/ChangeLog-5.php#5.3.6
 - fix php-pdo arch specific requires
 
-* Tue Mar 15 2011 Joe Orton <jorton at redhat.com> - 5.3.5-6
-- disable zip extension per "No Bundled Libraries" policy (#551513)
-
 * Mon Mar 07 2011 Caolán McNamara <caolanm at redhat.com> 5.3.5-5
 - rebuild for icu 4.6