php53.spec diff

gistfile1.txt

--- php53.spec-org	2012-06-15 04:26:17.000000000 +0900
+++ php53.spec	2012-07-06 12:30:57.000000000 +0900
@@ -12,11 +12,11 @@
 %global httpd_mmn %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)
 
 # Regression tests take a long time, you can skip 'em with this
-%{!?runselftest: %{expand: %%global runselftest 1}}
+%{!?runselftest: %{expand: %%global runselftest 0}}
 
 # Use the arch-specific mysql_config binary to avoid mismatch with the
 # arch detection heuristic used by bindir/mysql_config.
-%global mysql_config %{_libdir}/mysql/mysql_config
+%global mysql_config %{_bindir}/mysql_config
 
 %ifarch %{ix86} x86_64
 %global with_fpm 1
@@ -24,18 +24,15 @@
 %global with_fpm 0
 %endif
 
-%if 0%{?__isa:1}
-%global isasuffix -%{__isa}
-%else
-%global isasuffix %nil
-%endif
-
 # Flip these to 1 and zip respectively to enable zip support again
 %global with_zip 1
 %global zipmod zip
 
+%global real_name php
+%global name php53
+
 Summary: PHP scripting language for creating dynamic web sites
-Name: php
+Name: %{name}
 Version: 5.3.14
 Release: 1%{?dist}
 License: PHP
@@ -98,15 +95,21 @@
 BuildRequires: readline-devel
 %endif
 BuildRequires: bzip2, perl, libtool >= 1.4.3, gcc-c++
-Obsoletes: php-dbg, php3, phpfi, stronghold-php
+Obsoletes: %{name}-dbg, php3, phpfi, stronghold-php
 Requires: httpd-mmn = %{httpd_mmn}
 Provides: mod_php = %{version}-%{release}
-Requires: php-common%{?_isa} = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 # For backwards-compatibility, require php-cli for the time being:
-Requires: php-cli%{?_isa} = %{version}-%{release}
+Requires: %{name}-cli = %{version}-%{release}
 # To ensure correct /var/lib/php/session ownership:
 Requires(pre): httpd
 
+Provides: %{real_name} = %{version}-%{release}
+Provides: %{name} = %{version}-%{release}
+
+Conflicts: %{real_name} < %{base_ver}
+Conflicts: php51, php52, php54
+
 
 # Don't provides extensions, which are not shared library, as .so
 %{?filter_setup:
@@ -129,10 +132,13 @@
 %package cli
 Group: Development/Languages
 Summary: Command-line interface for PHP
-Requires: php-common%{?_isa} = %{version}-%{release}
-Provides: php-cgi = %{version}-%{release}, php-cgi%{?_isa} = %{version}-%{release}
-Provides: php-pcntl, php-pcntl%{?_isa}
-Provides: php-readline, php-readline%{?_isa}
+Requires: %{name}-common = %{version}-%{release}
+Provides: %{name}-cgi = %{version}-%{release}
+Provides: %{name}-pcntl
+Provides: %{name}-readline
+Provides: %{real_name}-cgi = %{version}-%{release}
+Provides: %{real_name}-pcntl
+Provides: %{real_name}-readline
 
 %description cli
 The php-cli package contains the command-line interface 
@@ -141,7 +147,7 @@
 %package zts
 Group: Development/Languages
 Summary: Thread-safe PHP interpreter for use with the Apache HTTP Server
-Requires: php-common%{?_isa} = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 Requires: httpd-mmn = %{httpd_mmn}
 BuildRequires: libtool-ltdl-devel
 
@@ -153,7 +159,7 @@
 %package fpm
 Group: Development/Languages
 Summary: PHP FastCGI Process Manager
-Requires: php-common%{?_isa} = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 %if 0%{?fedora} >= 15
 Requires: systemd-units
 %endif
@@ -168,52 +174,87 @@
 %package common
 Group: Development/Languages
 Summary: Common files for PHP
-# Remove this when value change
-Provides: php-api = %{apiver}, php-zend-abi = %{zendver}
-Provides: php(api) = %{apiver}, php(zend-abi) = %{zendver}
 # New ABI/API check - Arch specific
-Provides: php-api = %{apiver}%{isasuffix}, php-zend-abi = %{zendver}%{isasuffix}
-Provides: php(api) = %{apiver}%{isasuffix}, php(zend-abi) = %{zendver}%{isasuffix}
+Provides: %{name}-api = %{apiver}, %{name}-zend-abi = %{zendver}
+Provides: %{name}(api) = %{apiver}, %{name}(zend-abi) = %{zendver}
+# Provides for all builtin/shared modules:
+Provides: %{name}-bz2
+Provides: %{name}-calendar
+Provides: %{name}-ctype
+Provides: %{name}-curl
+Provides: %{name}-date
+Provides: %{name}-exif
+Provides: %{name}-fileinfo
+Provides: %{name}-pecl-Fileinfo = %{fileinfover}
+Provides: %{name}-pecl(Fileinfo) = %{fileinfover}
+Provides: %{name}-ftp
+Provides: %{name}-gettext
+Provides: %{name}-gmp
+Provides: %{name}-hash
+Provides: %{name}-mhash = %{version}
+Provides: %{name}-iconv
+Provides: %{name}-json
+Provides: %{name}-pecl-json = %{jsonver}
+Provides: %{name}-pecl(json) = %{jsonver}
+Provides: %{name}-libxml
+Provides: %{name}-openssl
+Provides: %{name}-pecl-phar = %{pharver}
+Provides: %{name}-pecl(phar) = %{pharver}
+Provides: %{name}-pcre
+Provides: %{name}-reflection
+Provides: %{name}-session
+Provides: %{name}-shmop
+Provides: %{name}-simplexml
+Provides: %{name}-sockets
+Provides: %{name}-spl
+Provides: %{name}-tokenizer
 # Provides for all builtin/shared modules:
-Provides: php-bz2, php-bz2%{?_isa}
-Provides: php-calendar, php-calendar%{?_isa}
-Provides: php-ctype, php-ctype%{?_isa}
-Provides: php-curl, php-curl%{?_isa}
-Provides: php-date, php-date%{?_isa}
-Provides: php-exif, php-exif%{?_isa}
-Provides: php-fileinfo, php-fileinfo%{?_isa}
-Provides: php-pecl-Fileinfo = %{fileinfover}, php-pecl-Fileinfo%{?_isa} = %{fileinfover}
-Provides: php-pecl(Fileinfo) = %{fileinfover}, php-pecl(Fileinfo)%{?_isa} = %{fileinfover}
-Provides: php-ftp, php-ftp%{?_isa}
-Provides: php-gettext, php-gettext%{?_isa}
-Provides: php-gmp, php-gmp%{?_isa}
-Provides: php-hash, php-hash%{?_isa}
-Provides: php-mhash = %{version}, php-mhash%{?_isa} = %{version}
-Provides: php-iconv, php-iconv%{?_isa}
-Provides: php-json, php-json%{?_isa}
-Provides: php-pecl-json = %{jsonver}, php-pecl-json%{?_isa} = %{jsonver}
-Provides: php-pecl(json) = %{jsonver}, php-pecl(json)%{?_isa} = %{jsonver}
-Provides: php-libxml, php-libxml%{?_isa}
-Provides: php-openssl, php-openssl%{?_isa}
-Provides: php-pecl-phar = %{pharver}, php-pecl-phar%{?_isa} = %{pharver}
-Provides: php-pecl(phar) = %{pharver}, php-pecl(phar)%{?_isa} = %{pharver}
-Provides: php-pcre, php-pcre%{?_isa}
-Provides: php-reflection, php-reflection%{?_isa}
-Provides: php-session, php-session%{?_isa}
-Provides: php-shmop, php-shmop%{?_isa}
-Provides: php-simplexml, php-simplexml%{?_isa}
-Provides: php-sockets, php-sockets%{?_isa}
-Provides: php-spl, php-spl%{?_isa}
-Provides: php-tokenizer, php-tokenizer%{?_isa}
+Provides: %{real_name}-bz2
+Provides: %{real_name}-calendar
+Provides: %{real_name}-ctype
+Provides: %{real_name}-curl
+Provides: %{real_name}-date
+Provides: %{real_name}-exif
+Provides: %{real_name}-fileinfo
+Provides: %{real_name}-pecl-Fileinfo = %{fileinfover}
+Provides: %{real_name}-pecl(Fileinfo) = %{fileinfover}
+Provides: %{real_name}-ftp
+Provides: %{real_name}-gettext
+Provides: %{real_name}-gmp
+Provides: %{real_name}-hash
+Provides: %{real_name}-mhash = %{version}
+Provides: %{real_name}-iconv
+Provides: %{real_name}-json
+Provides: %{real_name}-pecl-json = %{jsonver}
+Provides: %{real_name}-pecl(json) = %{jsonver}
+Provides: %{real_name}-libxml
+Provides: %{real_name}-openssl
+Provides: %{real_name}-pecl-phar = %{pharver}
+Provides: %{real_name}-pecl(phar) = %{pharver}
+Provides: %{real_name}-pcre
+Provides: %{real_name}-reflection
+Provides: %{real_name}-session
+Provides: %{real_name}-shmop
+Provides: %{real_name}-simplexml
+Provides: %{real_name}-sockets
+Provides: %{real_name}-spl
+Provides: %{real_name}-tokenizer
 %if %{with_zip}
-Provides: php-zip, php-zip%{?_isa}
-Provides: php-pecl-zip = %{zipver}, php-pecl-zip%{?_isa} = %{zipver}
-Provides: php-pecl(zip) = %{zipver}, php-pecl(zip)%{?_isa} = %{zipver}
-Obsoletes: php-pecl-zip
-%endif
-Provides: php-zlib, php-zlib%{?_isa}
-Obsoletes: php-openssl, php-pecl-json, php-json, php-pecl-phar, php-pecl-Fileinfo
-Obsoletes: php-mhash < 5.3.0
+Provides: %{name}-zip
+Provides: %{name}-pecl-zip = %{zipver}
+Provides: %{name}-pecl(zip) = %{zipver}
+Obsoletes: %{name}-pecl-zip
+Provides: %{real_name}-zip
+Provides: %{real_name}-pecl-zip = %{zipver}
+Provides: %{real_name}-pecl(zip) = %{zipver}
+Obsoletes: %{real_name}-pecl-zip
+%endif
+Provides: %{name}-zlib
+Obsoletes: %{name}-openssl, %{name}-pecl-json, %{name}-json, %{name}-pecl-phar, %{name}-pecl-Fileinfo
+Obsoletes: %{name}-mhash < 5.3.0
+Provides: %{real_name}-zlib
+Obsoletes: %{real_name}-openssl, %{real_name}-pecl-json, %{real_name}-json, %{real_name}-pecl-phar, %{real_name}-pecl-Fileinfo
+Obsoletes: %{real_name}-mhash < 5.3.0
 
 %description common
 The php-common package contains files used by both the php
@@ -222,8 +263,8 @@
 %package devel
 Group: Development/Libraries
 Summary: Files needed for building PHP extensions
-Requires: php%{?_isa} = %{version}-%{release}, autoconf, automake
-Obsoletes: php-pecl-pdo-devel
+Requires: %{name} = %{version}-%{release}, autoconf, automake
+Obsoletes: %{name}-pecl-pdo-devel
 
 %description devel
 The php-devel package contains the files needed for building PHP
@@ -233,7 +274,7 @@
 %package imap
 Summary: A module for PHP applications that use IMAP
 Group: Development/Languages
-Requires: php-common%{?_isa} = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 Obsoletes: mod_php3-imap, stronghold-php-imap
 BuildRequires: krb5-devel, openssl-devel, libc-client-devel
 
@@ -249,7 +290,7 @@
 %package ldap
 Summary: A module for PHP applications that use LDAP
 Group: Development/Languages
-Requires: php-common%{?_isa} = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 Obsoletes: mod_php3-ldap, stronghold-php-ldap
 BuildRequires: cyrus-sasl-devel, openldap-devel, openssl-devel
 
@@ -264,16 +305,22 @@
 %package pdo
 Summary: A database access abstraction module for PHP applications
 Group: Development/Languages
-Requires: php-common%{?_isa} = %{version}-%{release}
-Obsoletes: php-pecl-pdo-sqlite, php-pecl-pdo
+Requires: %{name}-common = %{version}-%{release}
+Obsoletes: %{name}-pecl-pdo-sqlite, %{name}-pecl-pdo
 # Remove this when value change
-Provides: php-pdo-abi = %{pdover}
+Provides: %{name}-pdo-abi = %{pdover}
+# Remove this when value change
+Provides: %{real_name}-pdo-abi = %{pdover}
+# New ABI/API check - Arch specific
+Provides: %{name}-pdo-abi = %{pdover}
 # New ABI/API check - Arch specific
-Provides: php-pdo-abi = %{pdover}%{isasuffix}
+Provides: %{real_name}-pdo-abi = %{pdover}
 %if 0%{?fedora} >= 9 || 0%{?rhel} >= 6
-Provides: php-sqlite3, php-sqlite3%{?_isa}
+Provides: %{name}-sqlite3
+Provides: %{real_name}-sqlite3
 %endif
-Provides: php-pdo_sqlite, php-pdo_sqlite%{?_isa}
+Provides: %{name}-pdo_sqlite
+Provides: %{real_name}-pdo_sqlite
 
 %description pdo
 The php-pdo package contains a dynamic shared object that will add
@@ -281,17 +328,20 @@
 a common interface for accessing MySQL, PostgreSQL or other 
 databases.
 
-%package mysql
+%package mysql55
 Summary: A module for PHP applications that use MySQL databases
 Group: Development/Languages
-Requires: php-pdo%{?_isa} = %{version}-%{release}
-Provides: php_database
-Provides: php-mysqli, php-mysqli%{?_isa}
-Provides: php-pdo_mysql, php-pdo_mysql%{?_isa}
+Requires: %{name}-pdo = %{version}-%{release}
+Provides: %{name}_database
+Provides: %{name}-mysqli
+Provides: %{name}-pdo_mysql
+Provides: %{real_name}_database
+Provides: %{real_name}-mysqli
+Provides: %{real_name}-pdo_mysql
 Obsoletes: mod_php3-mysql, stronghold-php-mysql
-BuildRequires: mysql-devel >= 4.1.0
+BuildRequires: MySQL-devel >= 5.5.0
 
-%description mysql
+%description mysql55
 The php-mysql package contains a dynamic shared object that will add
 MySQL database support to PHP. MySQL is an object-relational database
 management system. PHP is an HTML-embeddable scripting language. If
@@ -301,9 +351,11 @@
 %package pgsql
 Summary: A PostgreSQL database module for PHP
 Group: Development/Languages
-Requires: php-pdo%{?_isa} = %{version}-%{release}
-Provides: php_database
-Provides: php-pdo_pgsql, php-pdo_pgsql%{?_isa}
+Requires: %{name}-pdo = %{version}-%{release}
+Provides: %{name}_database
+Provides: %{name}-pdo_pgsql
+Provides: %{real_name}_database
+Provides: %{real_name}-pdo_pgsql
 Obsoletes: mod_php3-pgsql, stronghold-php-pgsql
 BuildRequires: krb5-devel, openssl-devel, postgresql-devel
 
@@ -319,11 +371,15 @@
 %package process
 Summary: Modules for PHP script using system process interfaces
 Group: Development/Languages
-Requires: php-common%{?_isa} = %{version}-%{release}
-Provides: php-posix, php-posix%{?_isa}
-Provides: php-sysvsem, php-sysvsem%{?_isa}
-Provides: php-sysvshm, php-sysvshm%{?_isa}
-Provides: php-sysvmsg, php-sysvmsg%{?_isa}
+Requires: %{name}-common = %{version}-%{release}
+Provides: %{name}-posix
+Provides: %{name}-sysvsem
+Provides: %{name}-sysvshm
+Provides: %{name}-sysvmsg
+Provides: %{real_name}-posix
+Provides: %{real_name}-sysvsem
+Provides: %{real_name}-sysvshm
+Provides: %{real_name}-sysvmsg
 
 %description process
 The php-process package contains dynamic shared objects which add
@@ -332,11 +388,13 @@
 
 %package odbc
 Group: Development/Languages
-Requires: php-pdo%{?_isa} = %{version}-%{release}
+Requires: %{name}-pdo = %{version}-%{release}
 Summary: A module for PHP applications that use ODBC databases
-Provides: php_database
-Provides: php-pdo_odbc, php-pdo_odbc%{?_isa}
-Obsoletes: stronghold-php-odbc
+Provides: %{name}_database
+Provides: %{name}-pdo_odbc
+Provides: %{real_name}_database
+Provides: %{real_name}-pdo_odbc
+Obsoletes: stronghold-%{name}-odbc
 BuildRequires: unixODBC-devel
 
 %description odbc
@@ -350,7 +408,7 @@
 
 %package soap
 Group: Development/Languages
-Requires: php-common%{?_isa} = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 Summary: A module for PHP applications that use the SOAP protocol
 BuildRequires: libxml2-devel
 
@@ -363,10 +421,13 @@
 Summary: A module for PHP applications that use Interbase/Firebird databases
 Group: Development/Languages
 BuildRequires: firebird-devel
-Requires: php-pdo%{?_isa} = %{version}-%{release}
-Provides: php_database
-Provides: php-firebird, php-firebird%{?_isa}
-Provides: php-pdo_firebird, php-pdo_firebird%{?_isa}
+Requires: %{name}-pdo = %{version}-%{release}
+Provides: %{name}_database
+Provides: %{name}-firebird
+Provides: %{name}-pdo_firebird
+Provides: %{real_name}_database
+Provides: %{real_name}-firebird
+Provides: %{real_name}-pdo_firebird
 
 %description interbase
 The php-interbase package contains a dynamic shared object that will add
@@ -385,7 +446,7 @@
 %package snmp
 Summary: A module for PHP applications that query SNMP-managed devices
 Group: Development/Languages
-Requires: php-common%{?_isa} = %{version}-%{release}, net-snmp
+Requires: %{name}-common = %{version}-%{release}, net-snmp
 BuildRequires: net-snmp-devel
 
 %description snmp
@@ -397,12 +458,16 @@
 %package xml
 Summary: A module for PHP applications which use XML
 Group: Development/Languages
-Requires: php-common%{?_isa} = %{version}-%{release}
-Obsoletes: php-domxml, php-dom
-Provides: php-dom, php-dom%{?_isa}
-Provides: php-xsl, php-xsl%{?_isa}
-Provides: php-domxml, php-domxml%{?_isa}
-Provides: php-wddx, php-wddx%{?_isa}
+Requires: %{name}-common = %{version}-%{release}
+Obsoletes: %{name}-domxml
+Provides: %{name}-dom
+Provides: %{name}-xsl
+Provides: %{name}-domxml
+Provides: %{name}-wddx
+Provides: %{real_name}-dom
+Provides: %{real_name}-xsl
+Provides: %{real_name}-domxml
+Provides: %{real_name}-wddx
 BuildRequires: libxslt-devel >= 1.0.18-1, libxml2-devel >= 2.4.14-1
 
 %description xml
@@ -413,7 +478,7 @@
 %package xmlrpc
 Summary: A module for PHP applications which use the XML-RPC protocol
 Group: Development/Languages
-Requires: php-common%{?_isa} = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 
 %description xmlrpc
 The php-xmlrpc package contains a dynamic shared object that will add
@@ -422,7 +487,7 @@
 %package mbstring
 Summary: A module for PHP applications which need multi-byte string handling
 Group: Development/Languages
-Requires: php-common%{?_isa} = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 
 %description mbstring
 The php-mbstring package contains a dynamic shared object that will add
@@ -431,7 +496,7 @@
 %package gd
 Summary: A module for PHP applications for using the gd graphics library
 Group: Development/Languages
-Requires: php-common%{?_isa} = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 # Required to build the bundled GD library
 BuildRequires: libjpeg-devel, libpng-devel, freetype-devel
 %if 0%{?rhel}%{?fedora} > 5
@@ -446,7 +511,7 @@
 %package bcmath
 Summary: A module for PHP applications for using the bcmath library
 Group: Development/Languages
-Requires: php-common%{?_isa} = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 
 %description bcmath
 The php-bcmath package contains a dynamic shared object that will add
@@ -455,7 +520,7 @@
 %package dba
 Summary: A database abstraction layer module for PHP applications
 Group: Development/Languages
-Requires: php-common%{?_isa} = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 
 %description dba
 The php-dba package contains a dynamic shared object that will add
@@ -464,7 +529,7 @@
 %package mcrypt
 Summary: Standard PHP module provides mcrypt library support
 Group: Development/Languages
-Requires: php-common%{?_isa} = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 BuildRequires: libmcrypt-devel
 
 %description mcrypt
@@ -474,7 +539,7 @@
 %package tidy
 Summary: Standard PHP module provides tidy library support
 Group: Development/Languages
-Requires: php-common%{?_isa} = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 BuildRequires: libtidy-devel
 
 %description tidy
@@ -484,9 +549,10 @@
 %package mssql
 Summary: MSSQL database module for PHP
 Group: Development/Languages
-Requires: php-pdo%{?_isa} = %{version}-%{release}
+Requires: %{name}-pdo = %{version}-%{release}
 BuildRequires: freetds-devel
-Provides: php-pdo_dblib, php-pdo_dblib%{?_isa}
+Provides: %{name}-pdo_dblib
+Provides: %{real_name}-pdo_dblib
 
 %description mssql
 The php-mssql package contains a dynamic shared object that will
@@ -497,10 +563,10 @@
 %package embedded
 Summary: PHP library for embedding in applications
 Group: System Environment/Libraries
-Requires: php-common%{?_isa} = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 # doing a real -devel package for just the .so symlink is a bit overkill
-Provides: php-embedded-devel = %{version}-%{release}
-Provides: php-embedded-devel%{?_isa} = %{version}-%{release}
+Provides: %{name}-embedded-devel = %{version}-%{release}
+Provides: %{real_name}-embedded-devel = %{version}-%{release}
 
 %description embedded
 The php-embedded package contains a library which can be embedded
@@ -509,7 +575,7 @@
 %package pspell
 Summary: A module for PHP applications for using pspell interfaces
 Group: System Environment/Libraries
-Requires: php-common%{?_isa} = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 BuildRequires: aspell-devel >= 0.50.0
 
 %description pspell
@@ -519,7 +585,7 @@
 %package recode
 Summary: A module for PHP applications for using the recode library
 Group: System Environment/Libraries
-Requires: php-common%{?_isa} = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 BuildRequires: recode-devel
 
 %description recode
@@ -529,7 +595,7 @@
 %package intl
 Summary: Internationalization extension for PHP applications
 Group: System Environment/Libraries
-Requires: php-common%{?_isa} = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 BuildRequires: libicu-devel >= 3.6
 
 %description intl
@@ -540,7 +606,7 @@
 %package enchant
 Summary: Human Language and Character Encoding Support
 Group: System Environment/Libraries
-Requires: php-common%{?_isa} = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 BuildRequires: enchant-devel >= 1.2.4
 
 %description enchant
@@ -550,7 +616,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{real_name}-%{version}%{?rcver}
 %patch1 -p1 -b .gnusrc
 %patch2 -p1 -b .install
 %patch3 -p1 -b .norpath
@@ -749,6 +815,7 @@
       --enable-dba=shared --with-db4=%{_prefix} \
       --with-xmlrpc=shared \
       --with-ldap=shared --with-ldap-sasl \
+      --with-mysql-sock=/var/lib/mysql/mysql.sock \
       --with-mysql=shared,%{_prefix} \
       --with-mysqli=shared,%{mysql_config} \
 %if 0%{?rhel}%{?fedora} > 5
@@ -980,9 +1047,9 @@
 
 # Install the macros file:
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm
-sed -e "s/@PHP_APIVER@/%{apiver}%{isasuffix}/" \
-    -e "s/@PHP_ZENDVER@/%{zendver}%{isasuffix}/" \
-    -e "s/@PHP_PDOVER@/%{pdover}%{isasuffix}/" \
+sed -e "s/@PHP_APIVER@/%{apiver}/" \
+    -e "s/@PHP_ZENDVER@/%{zendver}/" \
+    -e "s/@PHP_PDOVER@/%{pdover}/" \
     < %{SOURCE3} > macros.php
 install -m 644 -c macros.php \
            $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.php
@@ -1086,7 +1153,7 @@
 %{_libdir}/libphp5-%{version}.so
 
 %files pgsql -f files.pgsql
-%files mysql -f files.mysql
+%files mysql55 -f files.mysql
 %files odbc -f files.odbc
 %files imap -f files.imap
 %files ldap -f files.ldap