summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-01-21 13:47:12 +0100
committerRemi Collet <remi@remirepo.net>2019-01-21 13:47:12 +0100
commitadb1a52b423b32eddb27e5e6936035d04f1c81bf (patch)
treea33717c771e7be4aba913eb68590eb99592411d1
parent5e90ab858e0dc68d3d77e7749428632f73f27cff (diff)
cleanup for EL-8HEADmaster
-rw-r--r--php-pecl-inclued.spec17
1 files changed, 6 insertions, 11 deletions
diff --git a/php-pecl-inclued.spec b/php-pecl-inclued.spec
index 9106a7a..a482e45 100644
--- a/php-pecl-inclued.spec
+++ b/php-pecl-inclued.spec
@@ -1,6 +1,6 @@
# spec file for php-pecl-inclued
#
-# Copyright (c) 2013-2017 Remi Collet
+# Copyright (c) 2013-2019 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -19,7 +19,7 @@
Summary: Clued-in about your inclueds
Name: %{?scl_prefix}php-pecl-%{pecl_name}
Version: 0.1.3
-Release: 6%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 7%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/%{pecl_name}
@@ -34,7 +34,6 @@ Source1: LICENSE
# http://svn.php.net/viewvc?view=revision&revision=333016
Patch0: %{pecl_name}-svn.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{?scl_prefix}php-devel
BuildRequires: %{?scl_prefix}php-pear
@@ -144,8 +143,6 @@ make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
-
make -C NTS install INSTALL_ROOT=%{buildroot}
# install config file
@@ -168,7 +165,7 @@ done
%{!?_licensedir:install -Dpm 644 LICENSE %{buildroot}%{pecl_docdir}/%{pecl_name}/LICENSE}
-%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
@@ -202,12 +199,7 @@ fi
%endif
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
%{?_licensedir:%license NTS/LICENSE}
%doc %{pecl_docdir}/%{pecl_name}
%{pecl_xmldir}/%{name}.xml
@@ -222,6 +214,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Jan 21 2019 Remi Collet <remi@remirepo.net> - 0.1.3-7
+- cleanup for EL-8
+
* Tue Mar 8 2016 Remi Collet <remi@fedoraproject.org> - 0.1.3-6
- adapt for F24
- drop runtime dependency on pear, new scriptlets