[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/php/devel php.spec,1.112,1.113



Author: jorton

Update of /cvs/dist/rpms/php/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20660

Modified Files:
	php.spec 
Log Message:
- add php-pdo-abi version export (#193202)


Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- php.spec	2 Jun 2006 11:02:55 -0000	1.112
+++ php.spec	2 Jun 2006 11:07:41 -0000	1.113
@@ -1,5 +1,6 @@
 %define contentdir /var/www
 %define apiver 20041225
+%define pdover 20060409
 
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
@@ -133,6 +134,7 @@
 Group: Development/Languages
 Requires: php = %{version}-%{release}
 Obsoletes: php-pecl-pdo-sqlite, php-pecl-pdo
+Provides: php-pdo-abi = %{pdoabi}
 
 %description pdo
 The php-pdo package contains a dynamic shared object that will add
@@ -174,7 +176,7 @@
 
 %package odbc
 Group: Development/Languages
-Requires: php = %{version}-%{release}
+Requires: php = %{version}-%{release}, php-pdo
 Summary: A module for PHP applications that use ODBC databases.
 Provides: php_database
 Obsoletes: stronghold-php-odbc
@@ -324,6 +326,14 @@
    exit 1
 fi
 
+# Safety check for PDO ABI version change
+vpdo=`sed -n '/#define PDO_DRIVER_API/{s/.*[ 	]//;p}' ext/pdo/php_pdo_driver.h`
+if test "x${vpdo}" != "x%{pdover}"; then
+   : Error: Upstream PDO ABI version is now ${vpdo}, expecting %{pdover}.
+   : Update the pdover macro and rebuild.
+   exit 1
+fi
+
 %build
 # Force use of system libtool:
 libtoolize --force --copy
@@ -592,6 +602,7 @@
 %changelog
 * Fri Jun  2 2006 Joe Orton <jorton redhat com> 5.1.4-6
 - split out php-cli, php-common subpackages (#177821)
+- add php-pdo-abi version export (#193202)
 
 * Wed May 24 2006 Radek Vokal <rvokal redhat com> 5.1.4-5.1
 - rebuilt for new libnetsnmp


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]