[php-geshi/el6: 10/11] merge with master

[Xavier Bachelot]

commit 0cf84512fd07ccd622f5a7e7f2418bae984bf7d4
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Sun Sep 9 20:49:58 2012 +0200

    merge with master

 php-geshi.spec |   24 +++++++++++++++++++++---
 sources        |    2 +-
 2 files changed, 22 insertions(+), 4 deletions(-)
---
diff --git a/php-geshi.spec b/php-geshi.spec
index 0861ab2..79c52ef 100644
--- a/php-geshi.spec
+++ b/php-geshi.spec
@@ -1,17 +1,18 @@
 Name:           php-geshi
-Version:        1.0.8.8
+Version:        1.0.8.11
 Release:        1%{?dist}
 Summary:        Generic syntax highlighter
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://qbnz.com/highlighter/
-Source0:        http://downloads.sourceforge.net/geshi/geshi-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/geshi/GeSHi-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       php >= 4.3.0
 Requires:       php-mbstring
+Requires:       php-date
+Requires:       php-pcre
 
 
 %description
@@ -51,6 +52,23 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 21 2012 Xavier Bachelot <xavier at bachelot.org> 1.0.8.11-1
+- Update to 1.0.8.11.
+- Fix remote directory traversal and information disclosure bug (RHBZ#850425).
+- Fix Requires (RHBZ#848699).
+
+* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Jun 28 2011 Xavier Bachelot <xavier at bachelot.org> 1.0.8.10-1
+- Update to 1.0.8.10.
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Tue Jun 15 2010 Xavier Bachelot <xavier at bachelot.org> 1.0.8.8-1
 - Update to 1.0.8.8.
 - Fix Source0: URL, upstream changed tarball name.
diff --git a/sources b/sources
index 46c035c..ebbef7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-183de275099154a7a78aa81507ac5c84  geshi-1.0.8.8.tar.gz
+d35e6e5f5f28ae0d087f9990510a5760  GeSHi-1.0.8.11.tar.bz2