summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-01-21 13:25:29 +0100
committerRemi Collet <remi@remirepo.net>2019-01-21 13:25:29 +0100
commit77b824e26f461fea51c6117b9257f7a39affa74d (patch)
tree46000fc7c60fdeb9237839dee0b678076260ccc1
parentcf8bcafa45a584cba117cc39a6ac81e5a9a9a188 (diff)
cleanup for EL-8HEADmaster
-rw-r--r--php-pecl-graphdat.spec19
1 files changed, 7 insertions, 12 deletions
diff --git a/php-pecl-graphdat.spec b/php-pecl-graphdat.spec
index 2be1c5d..1f38811 100644
--- a/php-pecl-graphdat.spec
+++ b/php-pecl-graphdat.spec
@@ -1,6 +1,6 @@
# remirepo spec file for php-pecl-graphdat
#
-# Copyright (c) 2014-2017 Remi Collet
+# Copyright (c) 2014-2019 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -15,7 +15,7 @@
%else
%global ini_name 40-%{pecl_name}.ini
%endif
-%if 0%{?fedora} > 15 && 0%{?fedora} < 23 || 0%{?rhel} > 6
+%if ( 0%{?fedora} > 15 && 0%{?fedora} < 23 ) || ( 0%{?rhel} > 6 && 0%{?rhel} < 8 )
%global with_msgpack 1
%else
%global with_msgpack 0
@@ -24,14 +24,12 @@
Summary: Troubleshoot application and server performance
Name: %{?scl_prefix}php-pecl-graphdat
Version: 1.0.4
-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;')}}
# https://github.com/alphashack/graphdat-sdk-php/issues/6
License: ASL 2.0
-Group: Development/Languages
URL: http://pecl.php.net/package/%{pecl_name}
Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: %{?scl_prefix}php-devel
BuildRequires: %{?scl_prefix}php-pear
%if %{with_msgpack}
@@ -160,7 +158,6 @@ make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
# Install the NTS stuff
make -C NTS install INSTALL_ROOT=%{buildroot}
install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
@@ -195,7 +192,7 @@ done
%endif
-%if 0%{?fedora} < 24
+%if 0%{?fedora} < 24 && 0%{?rhel} < 8
# when pear installed alone, after us
%triggerin -- %{?scl_prefix}php-pear
if [ -x %{__pecl} ] ; then
@@ -215,12 +212,7 @@ fi
%endif
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
%{?_licensedir:%license NTS/LICENSE}
%doc %{pecl_docdir}/%{pecl_name}
%{pecl_xmldir}/%{name}.xml
@@ -235,6 +227,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Jan 21 2019 Remi Collet <remi@fedoraproject.org> - 1.0.4-4
+- cleanup for EL-8
+
* Tue Mar 8 2016 Remi Collet <remi@fedoraproject.org> - 1.0.4-3
- adapt for F24