[php-pecl-ncurses: 2/2] fix merge

[Remi Collet]

commit 4efd2e2a447ebbf8b5177e8c509f5f61d42f7acf
Merge: c18ffab 0961ea3
Author: remi <fedora at famillecollet.com>
Date:   Fri Jan 20 19:03:57 2012 +0100

    fix merge

 php-pecl-ncurses.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc php-pecl-ncurses.spec
index a87e86a,d8b7007..e1f1639
--- a/php-pecl-ncurses.spec
+++ b/php-pecl-ncurses.spec
@@@ -6,7 -6,7 +6,7 @@@
  Summary:      Terminal screen handling and optimization package
  Name:         php-pecl-ncurses
  Version:      1.0.1
--Release:      4%{?dist}
++Release:      5%{?dist}
  License:      PHP
  Group:        Development/Languages
  URL:          http://pecl.php.net/package/ncurses
@@@ -109,10 -110,9 +109,13 @@@ f
  
  
  %changelog
- * Thu Jan 19 2012 Remi Collet <remi at fedoraproject.org> - 1.0.1-4
++* Thu Jan 19 2012 Remi Collet <remi at fedoraproject.org> - 1.0.1-5
 +- build against php 5.4
 +- fix filters
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-3
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild