summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--php-5.2.4-embed.patch2
-rw-r--r--php54.spec19
3 files changed, 15 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index 6b9075c..4ab9ab5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-tembed
+tembed5*
diff --git a/php-5.2.4-embed.patch b/php-5.2.4-embed.patch
index 44276de..a9d5416 100644
--- a/php-5.2.4-embed.patch
+++ b/php-5.2.4-embed.patch
@@ -5,7 +5,7 @@
yes|shared)
PHP_EMBED_TYPE=shared
- INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -release \$(PHP_VERSION)"
++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -release \$(PHP_MAJOR_VERSION).\$(PHP_MINOR_VERSION)"
+ INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(libdir); \$(LIBTOOL) --mode=install \$(INSTALL) -m 0755 \$(OVERALL_TARGET) \$(INSTALL_ROOT)\$(libdir)"
;;
static)
diff --git a/php54.spec b/php54.spec
index 12d26e1..759613d 100644
--- a/php54.spec
+++ b/php54.spec
@@ -8,7 +8,7 @@
%global pharver 2.0.1
%global zipver 1.11.0
%global jsonver 1.2.1
-%global oci8ver 1.4.7
+%global oci8ver 1.4.9
%global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock)
@@ -25,8 +25,11 @@
# arch detection heuristic used by bindir/mysql_config.
%global mysql_config %{_libdir}/mysql/mysql_config
-#global snapdate 201201041830
-#global rcver RC1
+#global snapdate 201201041830
+%global rcver RC1
+
+# version used for php embedded library soname
+%global embed_version 5.4
# Optional components; pass "--with mssql" etc to rpmbuild.
%global with_oci8 %{?_with_oci8:1}%{!?_with_oci8:0}
@@ -61,9 +64,9 @@
Summary: PHP scripting language for creating dynamic web sites
Name: php
-Version: 5.4.8
+Version: 5.4.9
%if 0%{?snapdate:1}%{?rcver:1}
-Release: 0.3.%{?snapdate}%{?rcver}%{?dist}
+Release: 0.1.%{?snapdate}%{?rcver}%{?dist}
%else
Release: 5%{?dist}
%endif
@@ -1494,7 +1497,7 @@ fi
%files embedded
%defattr(-,root,root,-)
%{_libdir}/libphp5.so
-%{_libdir}/libphp5-%{version}%{?rcver}.so
+%{_libdir}/libphp5-%{embed_version}.so
%files pgsql -f files.pgsql
%files mysql -f files.mysql
@@ -1529,6 +1532,10 @@ fi
%changelog
+* Thu Nov 8 2012 Remi Collet <rcollet@redhat.com> 5.4.9-0.1.RC1
+- update to 5.4.9RC1
+- change php embedded library soname version to 5.4
+
* Tue Nov 6 2012 Remi Collet <rcollet@redhat.com> 5.4.8-5
- fix _httpd_mmn macro definition