cleanup for EL-8HEADmaster

1 files changed, 5 insertions, 24 deletions

diff --git a/php-pecl-runkit.spec b/php-pecl-runkit.spec
index a8018a4..ddb4ef6 100644
--- a/php-pecl-runkit.spec
+++ b/php-pecl-runkit.spec
@@ -18,9 +18,6 @@
 
 %{?scl:          %scl_package         php-pecl-runkit}
 
-#global gh_owner    zenovich
-#global gh_commit   80160a2cf94b0377924a7d08f9318bef0c225214
-#global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global pecl_name   runkit
 %global with_zts    0%{?__ztsphp:1}
 %if "%{php_version}" < "5.6"
@@ -33,20 +30,15 @@
 Summary:          Mangle with user defined functions and classes
 Name:             %{?sub_prefix}php-pecl-%{pecl_name}
 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;')}}
 License:          PHP
 Group:            Development/Libraries
 # URL:            http://pecl.php.net/package/runkit/
 # New upstream URL - https://bugs.php.net/bug.php?id=61189
 URL:              https://github.com/zenovich/runkit
 
-%if 0%{?gh_short:1}
-Source0:          https://github.com/%{gh_owner}/%{pecl_name}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz
-%else
 Source0:          http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
-%endif
 
-BuildRoot:        %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
 BuildRequires:    %{?scl_prefix}php-pear
 BuildRequires:    %{?scl_prefix}php-devel
 
@@ -97,15 +89,8 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 
 %prep
-%if 0%{?gh_short:1}
-%setup -q -c
-mv runkit-%{gh_commit} NTS
-mv NTS/package.xml .
-sed -e '/<channel>/s:%{channel}:pecl.php.net:' -i package.xml
-%else
 %setup -q -c
 mv runkit-%{version} NTS
-%endif
 
 # Don't install/register tests
 sed -e 's/role="test"/role="src"/' \
@@ -153,8 +138,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
-
 make install -C NTS install INSTALL_ROOT=%{buildroot}
 
 # Drop in the bit of configuration
@@ -206,7 +189,7 @@ REPORT_EXIT_STATUS=1 \
 %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
@@ -226,12 +209,7 @@ fi
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %{?_licensedir:%license NTS/LICENSE}
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
@@ -246,6 +224,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jan 21 2019 Remi Collet <remi@remirepo.net> - 1.0.4-4
+- cleanup for EL-8
+
 * Tue Mar  8 2016 Remi Collet <remi@fedoraproject.org> - 1.0.4-3
 - adapt for F24
 - fix license management