[svn] r6427 - trunk/rpms/php-pear-db

[packagers at lists.rpmforge.net]

Author: dries
Date: 2008-07-28 18:19:41 +0100 (Mon, 28 Jul 2008)
New Revision: 6427

Modified:
   trunk/rpms/php-pear-db/php-pear-db.spec
Log:
fix file conflicts (i hope)

Modified: trunk/rpms/php-pear-db/php-pear-db.spec
===================================================================
--- trunk/rpms/php-pear-db/php-pear-db.spec	2008-07-28 15:57:14 UTC (rev 6426)
+++ trunk/rpms/php-pear-db/php-pear-db.spec	2008-07-28 17:19:41 UTC (rev 6427)
@@ -7,7 +7,7 @@
 Summary: PEAR: Database Abstraction Layer
 Name: php-pear-db
 Version: 1.7.13
-Release: 1
+Release: 2
 License: PHP
 Group: Development/Libraries
 URL: http://pear.php.net/package/DB
@@ -53,18 +53,25 @@
 
 %install
 %{__rm} -rf %{buildroot}
-/usr/bin/pear install --installroot="%{buildroot}" --nodeps %{SOURCE0}
+/usr/bin/pear install --packagingroot="%{buildroot}" --nodeps %{SOURCE0}
 
 ### Clean up buildroot
 %{__rm} -f %{buildroot}%{pear_dir}/{.filemap,.lock}
+%{__rm} -Rf %{buildroot}%{pear_dir}/{.channels,.depdb*,.registry}
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(0644, root, root, 0755)
-%{pear_dir}/
+%{pear_dir}/DB.php
+%{pear_dir}/DB/
+%{pear_dir}/doc/DB/
+%{pear_dir}/test/DB/
 
 %changelog
+* Mon Jul 28 2008 Dries Verachtert <dries at ulyssis.org> - 1.7.13-2
+- Fix file conflicts with php-pear, thanks to Hugo van der Kooij and Brandon Amaro.
+
 * Thu Dec 20 2007 Dag Wieers <dag at wieers.com> - 1.7.13-1
 - Initial package. (using DAR)