From 9889c4aa76709a65b60a6779fdda2abc0e2ff607 Mon Sep 17 00:00:00 2001
From: Theodore Lee <theo148@gmail.com>
Date: Apr 20 2012 07:18:25 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/php-pecl-yaml


Conflicts:
	php-pecl-yaml.spec

---

diff --git a/php-pecl-yaml.spec b/php-pecl-yaml.spec
index b4f525d..dd6f91d 100644
--- a/php-pecl-yaml.spec
+++ b/php-pecl-yaml.spec
@@ -22,10 +22,12 @@ Requires(postun):   %{__pecl}
 
 Provides:       php-pecl(%{pecl_name}) = %{version}
 
-%{?filter_setup:
-%filter_provides_in %{php_extdir}/.*\.so$
-%filter_setup
-}
+# RPM 4.8
+%{?filter_provides_in: %filter_provides_in %{php_extdir}/.*\.so$}
+%{?filter_setup}
+# RPM 4.9
+%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{php_extdir}/.*\\.so$
+
 
 %description
 The YAML PHP Extension provides a wrapper to the LibYAML library. It gives the
@@ -110,6 +112,13 @@ fi
 - Update to upstream 1.1.0 release
 - Drop upstreamed cflags patch
 
+* Thu Jan 19 2012 Remi Collet <remi@fedoraproject.org> - 1.0.1-6
+- build against php 5.4
+- fix filters
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Fri May 13 2011 Theodore Lee <theo148@gmail.com> - 1.0.1-4
 - Fix commenting in module configuration