summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-03-06 07:00:44 +0100
committerRemi Collet <fedora@famillecollet.com>2016-03-06 07:00:44 +0100
commitae39e75a355f627506c9dab3a4e21178007109da (patch)
tree0ec0cb97a815a49f24564a8784869e98a6e79904
parent9b9a4020d06a43f8fabddf4e6187594cc7b08997 (diff)
php-pecl-libsodium: F24
-rw-r--r--php-pecl-libsodium.spec27
1 files changed, 17 insertions, 10 deletions
diff --git a/php-pecl-libsodium.spec b/php-pecl-libsodium.spec
index b0285a1..0ce52a0 100644
--- a/php-pecl-libsodium.spec
+++ b/php-pecl-libsodium.spec
@@ -15,9 +15,6 @@
%endif
%{?scl: %scl_package php-pecl-libsodium}
-%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d}
-%{!?__pecl: %global __pecl %{_bindir}/pecl}
-%{!?__php: %global __php %{_bindir}/php}
%global with_zts 0%{?__ztsphp:1}
%global pecl_name libsodium
@@ -32,7 +29,7 @@
Summary: Wrapper for the Sodium cryptographic library
Name: %{?sub_prefix}php-pecl-%{pecl_name}
Version: 1.0.2
-Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 4%{?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}
@@ -59,10 +56,12 @@ Requires: %{?scl_prefix}php(api) = %{php_core_api}
Requires: libsodium%{?_isa} >= %{buildver}
%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
-Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
-Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
-Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
+Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
+Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
+Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release}
+Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1}
# Other third party repo stuff
@@ -102,7 +101,9 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
mv %{pecl_name}-%{version} NTS
# Don't install tests
-sed -e '/role="test"/d' -i package.xml
+sed -e 's/role="test"/role="src"/' \
+ %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
+ -i package.xml
cd NTS
%patch0 -p1 -b .pr70
@@ -166,6 +167,7 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
done
+%if 0%{?fedora} < 24
# when pear installed alone, after us
%triggerin -- %{?scl_prefix}php-pear
if [ -x %{__pecl} ] ; then
@@ -182,6 +184,7 @@ fi
if [ $1 -eq 0 -a -x %{__pecl} ] ; then
%{pecl_uninstall} %{pecl_name} >/dev/null || :
fi
+%endif
%check
@@ -238,7 +241,10 @@ rm -rf %{buildroot}
%changelog
-* Wed Dec 8 2015 Remi Collet <remi@fedoraproject.org> - 1.0.2-3
+* Sun Mar 6 2016 Remi Collet <remi@fedoraproject.org> - 1.0.2-4
+- adapt for F24
+
+* Wed Dec 9 2015 Remi Collet <remi@fedoraproject.org> - 1.0.2-3
- rebuild against libsodium 1.0.7
- add upstream patch for test suite from
https://github.com/jedisct1/libsodium-php/pull/70
@@ -297,4 +303,5 @@ rm -rf %{buildroot}
* Sun Sep 28 2014 Remi Collet <rcollet@redhat.com> - 0.1.1-1
- initial package, version 0.1.1 (beta)
-- open https://github.com/jedisct1/libsodium-php/pull/14 \ No newline at end of file
+- open https://github.com/jedisct1/libsodium-php/pull/14
+