summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-07-17 18:34:02 +0200
committerRemi Collet <remi@remirepo.net>2017-07-17 18:34:02 +0200
commite6a0f2d1f57e4ef8f9eb2faa4dc0f5f54c778e0a (patch)
treef163b01aa303580575b6403689a6d5d14c658778
parentbad70ad950bb84eef04fa190b0610541a4adc146 (diff)
cleanup and rebuild
-rw-r--r--php-pecl-libsodium2.spec20
1 files changed, 7 insertions, 13 deletions
diff --git a/php-pecl-libsodium2.spec b/php-pecl-libsodium2.spec
index b65263e..8f6c74f 100644
--- a/php-pecl-libsodium2.spec
+++ b/php-pecl-libsodium2.spec
@@ -25,20 +25,14 @@
Summary: Wrapper for the Sodium cryptographic library
Name: %{?sub_prefix}php-pecl-%{proj_name}2
Version: 2.0.2
-Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: BSD
Group: Development/Languages
URL: http://pecl.php.net/package/%{proj_name}
Source0: http://pecl.php.net/get/%{proj_name}-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if "%{?vendor}" == "Remi Collet"
# Ensure libsodium-last is used
BuildRequires: pkgconfig(libsodium) >= 1.0.12
-%else
-# Per upstream documentation
-BuildRequires: libsodium-devel >= 0.6.0
-%endif
BuildRequires: %{?scl_prefix}php-devel > 7
BuildRequires: %{?scl_prefix}php-pear
BuildRequires: %{?scl_prefix}php-json
@@ -135,6 +129,8 @@ EOF
%build
+%{?dtsenable}
+
cd NTS
%{_bindir}/phpize
%configure \
@@ -151,7 +147,7 @@ make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
+%{?dtsenable}
make -C NTS install INSTALL_ROOT=%{buildroot}
@@ -227,12 +223,7 @@ REPORT_EXIT_STATUS=1 \
%endif
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
%doc %{pecl_docdir}/%{proj_name}
%{?_licensedir:%license NTS/LICENSE}
%{pecl_xmldir}/%{name}.xml
@@ -247,6 +238,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Jul 17 2017 Remi Collet <remi@fedoraproject.org> - 2.0.2-2
+- rebuild
+
* Mon Jul 17 2017 Remi Collet <remi@fedoraproject.org> - 2.0.2-1
- renamed to php-pecl-libsodium2 (new API)
- update to 2.0.2