summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-03-03 09:34:44 +0100
committerRemi Collet <fedora@famillecollet.com>2015-03-03 09:34:44 +0100
commit0a9fbd0af29880d83bc51388ad45c7b87319aa39 (patch)
tree91b2c362e8f74179e02637b98c155fcec25a84ab
parentce981df9e407ce4372ce2ac1fafab8d3ae4a4b80 (diff)
php-ioncube-loader: cleanup
-rw-r--r--LICENSE.txt2
-rw-r--r--php-ioncube-loader.spec21
2 files changed, 18 insertions, 5 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index ba62a49..b3ae026 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -239,4 +239,4 @@ This License Agreement and any issues relating thereto shall be construed and
interpreted in accordance with the laws of England and subject to the
exclusive jurisdiction of the English courts.
-Copyright (c) 2002-2013 ionCube Software LLP Last revised 3-May-2013
+Copyright (c) 2002-2015 ionCube Ltd. Last revised 3-May-2013
diff --git a/php-ioncube-loader.spec b/php-ioncube-loader.spec
index 8414590..034ef93 100644
--- a/php-ioncube-loader.spec
+++ b/php-ioncube-loader.spec
@@ -24,7 +24,7 @@
Name: %{?scl_prefix}php-ioncube-loader
Summary: Loader for ionCube Encoded Files
Version: 4.7.5
-Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: Distribuable
Group: Development/Languages
@@ -83,16 +83,25 @@ tar xvf %{SOURCE0}
# Sometime file is missing
# http://forum.ioncube.com/viewtopic.php?t=4245
[ -f ioncube/LICENSE.txt ] || cp %{SOURCE2} ioncube
+sed -e 's/\r//' -i ioncube/LICENSE.txt
-cat > %{extname}.nts << 'EOF'
+cat << 'EOF' | tee %{extname}.nts
; Enable %{extname} extension module
+%if "%{php_version}" > "5.5"
+zend_extension = %{extname}.so
+%else
zend_extension = %{php_extdir}/%{extname}.so
+%endif
EOF
%if %{with_zts}
-cat > %{extname}.zts << 'EOF'
+cat << 'EOF' | tee %{extname}.zts
; Enable %{extname} extension module
+%if "%{php_version}" > "5.5"
+zend_extension = %{extname}.so
+%else
zend_extension = %{php_ztsextdir}/%{extname}.so
+%endif
EOF
%endif
@@ -140,7 +149,6 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%{!?_licensedir:%global license %%doc}
%license ioncube/LICENSE.txt
-#doc ioncube/README.txt
%config(noreplace) %{php_inidir}/%{ininame}
%{php_extdir}/%{extname}.so
@@ -152,6 +160,11 @@ rm -rf %{buildroot}
%changelog
+* Tue Mar 3 2015 Remi Collet <RPMS@famillecollet.com> - 4.7.5-2
+- LICENSE.txt and README.txt are back
+ http://forum.ioncube.com/viewtopic.php?t=4245
+- php 5.5+ don't need full extension path
+
* Sat Feb 28 2015 Remi Collet <RPMS@famillecollet.com> - 4.7.5-1
- update to 4.7.5 (Feb 27, 2015)