[php/f17] fix merge of changelog

[Remi Collet]

commit 0cbbb44d93649e0b371bfad01b87197f21f3e172
Author: remi <fedora at famillecollet.com>
Date:   Tue Sep 18 14:28:42 2012 +0200

    fix merge of changelog

 php.spec |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/php.spec b/php.spec
index 38b8d4f..f32be15 100644
--- a/php.spec
+++ b/php.spec
@@ -33,14 +33,14 @@
 # /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4
 %{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}}
 
-%if 0%{?fedora} >= 17
-%global with_zip     1
-%global with_libzip  1
-%global zipmod       zip
-%else
+%if 0%{?fedora} < 17
 %global with_zip     0
 %global with_libzip  0
 %global zipmod       %nil
+%else
+%global with_zip     1
+%global with_libzip  1
+%global zipmod       zip
 %endif
 
 %if 0%{?fedora} < 18
@@ -52,7 +52,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: 5.4.7
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
@@ -1279,6 +1279,9 @@ fi
 
 
 %changelog
+* Tue Sep 18 2012 Remi Collet <rcollet at redhat.com> 5.4.7-3
+- fix test to enable zip extension on RHEL-7
+
 * Fri Sep 14 2012 Remi Collet <remi at fedoraproject.org> 5.4.7-1
 - update to 5.4.7
   http://www.php.net/releases/5_4_7.php