summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-06-13 18:25:56 +0200
committerRemi Collet <fedora@famillecollet.com>2012-06-13 18:25:56 +0200
commit8dd858b3219abedf09d5682c5166042f8a82fce4 (patch)
tree81daca8e6207c1c1aaa3b7c10f1f2bd9b5ea9985
parent7f31c8be6abd4c5ddb0228e54555d92351ae600d (diff)
php 5.4.4
-rw-r--r--Makefile2
-rw-r--r--php54.spec13
2 files changed, 6 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 1e65467..91b0fd5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
SRCDIR := $(shell pwd)
NAME := $(shell basename $(SRCDIR))
-include ../common/Makefile
+include ../../common/Makefile
diff --git a/php54.spec b/php54.spec
index 271c0d7..4849643 100644
--- a/php54.spec
+++ b/php54.spec
@@ -28,7 +28,7 @@
%global mysql_config %{_libdir}/mysql/mysql_config
#global snapdate 201201041830
-%global rcver RC2
+#global rcver RC2
# Optional components; pass "--with mssql" etc to rpmbuild.
%global with_oci8 %{?_with_oci8:1}%{!?_with_oci8:0}
@@ -75,7 +75,7 @@ Version: 5.4.4
%if 0%{?snapdate}
Release: 0.7.%{snapdate}%{?dist}
%else
-Release: 0.2.RC2%{?dist}
+Release: 1%{?dist}
%endif
License: PHP
Group: Development/Languages
@@ -695,12 +695,6 @@ rm -f tests/basic/php_egg_logo_guid.phpt
rm -f ext/standard/tests/file/bug22414.phpt \
ext/iconv/tests/bug16069.phpt
-# Temporary fix for 5.4.4RC1
-sed -i -e '/PHP_EXTRA_VERSION/s/-dev/RC2/' \
- -e '/PHP_RELEASE_VERSION/s/5/4/' configure.in
-sed -i -e '/PHP_VERSION/s/5.4.5-dev/5.4.4RC2/' \
- -e '/PHP_EXTRA_VERSION/s/-dev/RC2/' \
- -e '/PHP_RELEASE_VERSION/s/5/4/' main/php_version.h
# Safety check for API version change.
pver=$(sed -n '/#define PHP_VERSION /{s/.* "//;s/".*$//;p}' main/php_version.h)
if test "x${pver}" != "x%{version}%{?rcver}"; then
@@ -1491,6 +1485,9 @@ fi
%endif
%changelog
+* Wed Jun 13 2012 Remi Collet <Fedora@famillecollet.com> 5.4.4-1
+- update to 5.4.4 finale
+
* Thu May 31 2012 Remi Collet <Fedora@famillecollet.com> 5.4.4-0.2.RC2
- update to 5.4.4RC2