summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-01-31 12:32:02 +0100
committerRemi Collet <remi@remirepo.net>2018-01-31 12:32:02 +0100
commita37d12c5c8cbbe9a57b6d6c5cb3ffababbf18355 (patch)
tree48003a357c8426c64fc72e6e8f38e0b70b53fa17
parent29b7d8e73551128e0d1a8e1b1b45243a17dd6472 (diff)
ensure OpenSSL 1.1 is used on F26+
-rw-r--r--.gitignore8
-rw-r--r--php-pecl-crypto.spec17
2 files changed, 18 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fc9aa8c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+clog
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/php-pecl-crypto.spec b/php-pecl-crypto.spec
index 53a0345..d2b3ffb 100644
--- a/php-pecl-crypto.spec
+++ b/php-pecl-crypto.spec
@@ -1,17 +1,20 @@
# remirepo spec file for php-pecl-crypto
#
-# Copyright (c) 2013-2017 Remi Collet
+# Copyright (c) 2013-2018 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
+
+# we don't want -z defs linker flag
+%undefine _strict_symbol_defs_build
+
%if 0%{?scl:1}
%global sub_prefix %{scl_prefix}
%scl_package php-pecl-crypto
%endif
-
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
%global pecl_name crypto
%global with_tests 0%{!?_without_tests:1}
@@ -24,7 +27,7 @@
Summary: Wrapper for OpenSSL Crypto Library
Name: %{?sub_prefix}php-pecl-%{pecl_name}
Version: 0.3.1
-Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: BSD
Group: Development/Languages
URL: http://pecl.php.net/package/%{pecl_name}
@@ -33,11 +36,8 @@ Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{?scl_prefix}php-devel > 5.3
BuildRequires: %{?scl_prefix}php-pear
-%if 0%{?rhel} == 5
+# don't use pkg-config to avoid compat-openssl10
BuildRequires: openssl-devel
-%else
-BuildRequires: pkgconfig(openssl)
-%endif
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
@@ -239,6 +239,9 @@ rm -rf %{buildroot}
%changelog
+* Wed Jan 31 2018 Remi Collet <remi@remirepo.net> - 0.3.1-3
+- ensure OpenSSL 1.1 is used on F26+
+
* Tue Jul 18 2017 Remi Collet <remi@remirepo.net> - 0.3.1-2
- rebuild for PHP 7.2.0beta1 new API