diff --git a/needs.rebuild b/needs.rebuild
deleted file mode 100644
index 815fd29..0000000
--- a/needs.rebuild
+++ /dev/null
@@ -1 +0,0 @@
-http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild
diff --git a/php-pear-DB.spec b/php-pear-DB.spec
index 25fb3e9..c77795d 100644
--- a/php-pear-DB.spec
+++ b/php-pear-DB.spec
@@ -1,27 +1,29 @@
-%define peardir %(pear config-get php_dir 2> /dev/null || echo %{_datadir}/pear)
-%define xmldir  %{peardir}/.pkgxml
-
-Summary: PEAR: Database Abstraction Layer
-Name: php-pear-DB
-Version: 1.7.6
-Release: 6%{?dist}
-License: The PHP License
-Group: Development/Libraries
-Source0: http://pear.php.net/get/DB-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL: http://pear.php.net/package/DB
-BuildArchitectures: noarch
-BuildRequires: php-pear
-Provides: php-pear(DB) = 1.7.6
-Requires: php >= 4.2.0, php-pear(PEAR)
-Requires(post): php-pear
-Requires(postun): php-pear
+%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%define pear_name DB
+
+Name:           php-pear-DB
+Version:        1.7.6
+Release:        7%{?dist}
+Summary:        PEAR: Database Abstraction Layer
+
+Group:          Development/Libraries
+License:        PHP License
+URL:            http://pear.php.net/package/DB
+Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  php-pear >= 1:1.4.9-1.2
+Requires(post): %{__pear}
+Requires(postun): %{__pear}
+Provides:       php-pear(%{pear_name}) = %{version}
+Requires:       php >= 4.2.0
+Requires:       php-pear(PEAR)
 
 %description
-DB is a database abstraction layer for PHP providing:
-
+DB is a database abstraction layer providing:
 * an OO-style query API
-* portability features that make programs written for one DBMS work with 
+* portability features that make programs written for one DBMS work with
   other DBMS's
 * a DSN (data source name) format for specifying database servers
 * prepare/execute (bind) emulation for databases that don't support it natively
@@ -38,60 +40,63 @@ DB is a database abstraction layer for PHP providing:
 DB layers itself on top of PHP's existing database extensions.
 
 %prep
-%setup -c -T
-pear -v -c pearrc \
-        -d php_dir=%{peardir} \
-        -d doc_dir=/docs \
-        -d bin_dir=%{_bindir} \
-        -d data_dir=%{peardir}/data \
-        -d test_dir=%{peardir}/test \
-        -d ext_dir=%{_libdir} \
-        -s
+%setup -q -c
+[ -f package2.xml ] || mv package.xml package2.xml
+mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+cd %{pear_name}-%{version}
+
 
 %build
+cd %{pear_name}-%{version}
+# Empty build section, most likely nothing required.
+
 
 %install
-rm -rf %{buildroot}
-pear -c pearrc install --nodeps -R %{buildroot} %{SOURCE0}
+cd %{pear_name}-%{version}
+rm -rf $RPM_BUILD_ROOT docdir
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+
+# Move documentation
+mkdir -p docdir
+mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+
 
 # Clean up unnecessary files
-rm pearrc
-rm %{buildroot}%{peardir}/.filemap
-rm %{buildroot}%{peardir}/.lock
-rm -rf %{buildroot}%{peardir}/.registry
-rm -rf %{buildroot}%{peardir}/.channels
-rm %{buildroot}%{peardir}/.depdb
-rm %{buildroot}%{peardir}/.depdblock
-
-# Sort out documentation
-mv %{buildroot}/docs/DB/* .
-rm -rf %{buildroot}/docs
+rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{xmldir}
-tar -xzf %{SOURCE0} package.xml
-cp -p package.xml %{buildroot}%{xmldir}/DB.xml
+mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
 
 %post
-pear install --nodeps --soft --force --register-only %{xmldir}/DB.xml >/dev/null
+%{__pear} install --nodeps --soft --force --register-only \
+    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
 
 %postun
-if [ "$1" -eq "0" ]; then
-    pear uninstall --nodeps --ignore-errors --register-only DB >/dev/null
+if [ $1 -eq 0 ] ; then
+    %{__pear} uninstall --nodeps --ignore-errors --register-only \
+        %{pear_name} >/dev/null || :
 fi
 
+
 %files
-%defattr(-,root,root)
-%doc doc/IDEAS doc/MAINTAINERS doc/STATUS doc/TESTERS
-%{xmldir}/DB.xml
-%{peardir}/test/DB
-%{peardir}/DB.php
-%{peardir}/DB
+%defattr(-,root,root,-)
+%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
+%{pear_xmldir}/%{pear_name}.xml
+%{pear_testdir}/DB
+# Expand this as needed to avoid owning dirs owned by our dependencies
+%{pear_phpdir}/DB*
+
 
 %changelog
+* Sun Sep 10 2006 Tim Jackson <rpm@timj.co.uk> 1.7.6-7
+- Update spec to new conventions (#198706)
+
 * Wed Jun 28 2006 Tim Jackson <rpm@timj.co.uk> 1.7.6-6
 - Move tests to peardir/test instead of peardir/tests (bug #196764)