diff --git a/.gitignore b/.gitignore
index 2a6dd65..58e662e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+package*.xml
 MDB2-2.4.1.tgz
+/MDB2-2.5.0b3.tgz
diff --git a/php-pear-MDB2-2.4.1-lob.patch b/php-pear-MDB2-2.4.1-lob.patch
deleted file mode 100644
index 18e2c05..0000000
--- a/php-pear-MDB2-2.4.1-lob.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-http://cvs.php.net/viewvc.cgi/pear/MDB2/MDB2.php?r1=1.292&r2=1.293&diff_format=u
-Index: pear/MDB2/MDB2.php
-diff -u pear/MDB2/MDB2.php:1.292 pear/MDB2/MDB2.php:1.293
---- MDB2.php:1.292	Wed Apr 25 09:31:01 2007
-+++ MDB2.php	Thu May  3 22:20:20 2007
-@@ -43,7 +43,7 @@
- // | Author: Lukas Smith <smith@pooteeweet.org>                           |
- // +----------------------------------------------------------------------+
- //
--// $Id: MDB2.php,v 1.292 2007/04/25 09:31:01 quipo Exp $
-+// $Id: MDB2.php,v 1.293 2007/05/03 22:20:20 davidc Exp $
- //
- 
- /**
-@@ -1156,6 +1156,7 @@
-         'datatype_map' => array(),
-         'datatype_map_callback' => array(),
-         'nativetype_map_callback' => array(),
-+        'lob_allow_url_include' => false,
-     );
- 
-     /**
-@@ -4268,4 +4269,4 @@
- }
- 
- // }}}
--?>
-\ No newline at end of file
-+?>
diff --git a/php-pear-MDB2.spec b/php-pear-MDB2.spec
index 7850c0e..454ca42 100644
--- a/php-pear-MDB2.spec
+++ b/php-pear-MDB2.spec
@@ -1,24 +1,30 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define ClassName MDB2
+%global pear_name MDB2
+%global prever    b3
 
 Name:           php-pear-MDB2
-Version:        2.4.1
+Version:        2.5.0
+%if 0%{?prever:1}
+Release:        0.1.%{?prever}%{?dist}
+%else
 Release:        4%{?dist}
+%endif
 Summary:        Database Abstraction Layer
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://pear.php.net/package/MDB2
-Source0:        http://pear.php.net/get/%{ClassName}-%{version}.tgz
-Patch0:         %{name}-2.4.1-lob.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://pear.php.net/get/%{pear_name}-%{version}%{?prever}.tgz
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2
-Requires:       php-pear(PEAR) >= 1.3.6
+BuildRequires:  php-pear(PEAR) >= 1.9.1
+
+Requires:       php-common >= 5.3.0
+Requires:       php-pear(PEAR)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Provides:       php-pear(%{ClassName}) = %{version}
+Provides:       php-pear(%{pear_name}) = %{version}%{?prever}
 
 %description
 PEAR::MDB2 is a merge of the PEAR::DB and Metabase php database abstraction
@@ -31,38 +37,36 @@ portability.
 
 %prep
 %setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{ClassName}-%{version}/%{ClassName}.xml
-cd %{ClassName}-%{version}
+# Create a "localized" php.ini to avoid build warning
+cp /etc/php.ini .
+echo "date.timezone=UTC" >>php.ini
+
+cd %{pear_name}-%{version}%{?prever}
+# package.xml is V2
+mv ../package.xml %{name}.xml
 
 
 %build
-cd %{ClassName}-%{version}
+cd %{pear_name}-%{version}%{?prever}
 # Empty build section, most likely nothing required.
 
 
 %install
-cd %{ClassName}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{ClassName}.xml
+cd %{pear_name}-%{version}%{?prever}
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Move documentation
 mkdir -p docdir
-mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
-mv $RPM_BUILD_ROOT%{pear_datadir}/%{ClassName}/LICENSE docdir/%{ClassName}/docs
+mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/docs ../docdir
+mv $RPM_BUILD_ROOT%{pear_datadir}/%{pear_name}/LICENSE ../docdir/
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
 install -d $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{ClassName}.xml $RPM_BUILD_ROOT%{pear_xmldir}
-
-# Add LOB security patch (bz #379081)
-# Must be patched manually after install
-pushd $RPM_BUILD_ROOT%{pear_phpdir}
-patch -p0 < %{PATCH0}
-popd
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -71,25 +75,29 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{ClassName}.xml >/dev/null ||:
+    %{pear_xmldir}/%{name}.xml >/dev/null ||:
 
 %postun
 if [ "$1" -eq "0" ]; then
     %{__pear} uninstall --nodeps --ignore-errors --register-only \
-        %{ClassName} >/dev/null ||:
+        %{pear_name} >/dev/null ||:
 fi
 
 
 %files
 %defattr(-,root,root,-)
-%doc %{ClassName}-%{version}/docdir/%{ClassName}/docs/*
-%{pear_xmldir}/%{ClassName}.xml
-%{pear_testdir}/%{ClassName}
-%{pear_phpdir}/%{ClassName}
+%doc docdir/*
+%{pear_xmldir}/%{name}.xml
+%{pear_testdir}/%{pear_name}
+%{pear_phpdir}/%{pear_name}
 %{pear_phpdir}/MDB2.php
 
 
 %changelog
+* Fri Dec 31 2010 Remi Collet <Fedora@FamilleCollet.com> - 2.5.0-0.1.b3
+- update to 2.5.0b3
+- move MDB2.xml to php-pear-MDB2.xml
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 3692c41..349bad8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ca272056a3a4f1031a2b0e7f2e286a12  MDB2-2.4.1.tgz
+5a4333a18f331a5176010ad45f9617ea  MDB2-2.5.0b3.tgz