php-pecl-memprof: cleanups for review

1 files changed, 26 insertions, 27 deletions

diff --git a/php-pecl-memprof.spec b/php-pecl-memprof.spec
index 2891fe1..69b115b 100644
--- a/php-pecl-memprof.spec
+++ b/php-pecl-memprof.spec
@@ -6,9 +6,8 @@
 #
 # Please, preserve the changelog entries
 #
-%{?scl:%scl_package php-pecl-memprof}
-%{!?php_inidir:  %{expand: %%global php_inidir  %{_sysconfdir}/php.d}}
-%{!?__pecl:      %{expand: %%global __pecl      %{_bindir}/pecl}}
+%{!?php_inidir:  %global php_inidir  %{_sysconfdir}/php.d}
+%{!?__pecl:      %global __pecl      %{_bindir}/pecl}
 
 # ZTS build is broken
 # https://github.com/arnaud-lb/php-memory-profiler/pull/7
@@ -16,9 +15,9 @@
 %global pecl_name memprof
 
 Summary:        Memory usage profiler
-Name:           %{?scl_prefix}php-pecl-%{pecl_name}
+Name:           php-pecl-%{pecl_name}
 Version:        1.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        BSD
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/%{pecl_name}
@@ -28,24 +27,25 @@ Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 Source1:        https://raw.github.com/arnaud-lb/php-memory-profiler/master/LICENSE
 Source2:        https://raw.github.com/arnaud-lb/php-memory-profiler/master/README.md
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  %{?scl_prefix}php-devel > 5.3
-BuildRequires:  %{?scl_prefix}php-pear
+BuildRequires:  php-devel > 5.3
+BuildRequires:  php-pear
 BuildRequires:  Judy-devel
 
 Requires(post): %{__pecl}
 Requires(postun): %{__pecl}
-Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
-Requires:       %{?scl_prefix}php(api) = %{php_core_api}
+Requires:       php(zend-abi) = %{php_zend_api}
+Requires:       php(api) = %{php_core_api}
 
-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:       php-%{pecl_name} = %{version}
+Provides:       php-%{pecl_name}%{?_isa} = %{version}
+Provides:       php-pecl(%{pecl_name}) = %{version}
+Provides:       php-pecl(%{pecl_name})%{?_isa} = %{version}
 
+%if 0%{?fedora} < 20
 # Filter shared private
 %{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
 %{?filter_setup}
+%endif
 
 
 %description
@@ -55,9 +55,9 @@ Memory usage profiler for PHP scripts.
 %prep
 %setup -q -c
 mv %{pecl_name}-%{version} NTS
+cp %{SOURCE1} %{SOURCE2} .
 
 cd NTS
-cp %{SOURCE1} %{SOURCE2} .
 sed -e 's:/lib:/$PHP_LIBDIR:' -i config.m4
 
 # Sanity check, really often broken
@@ -101,8 +101,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
-
 make -C NTS install INSTALL_ROOT=%{buildroot}
 
 # install config file
@@ -117,6 +115,10 @@ make -C ZTS install INSTALL_ROOT=%{buildroot}
 install -D -m 644 %{pecl_name}.ini %{buildroot}%{php_ztsinidir}/%{pecl_name}.ini
 %endif
 
+# Documentation
+install -Dpm 644 LICENSE   %{buildroot}%{pecl_docdir}/%{pecl_name}/LICENSE
+install -Dpm 644 README.md %{buildroot}%{pecl_docdir}/%{pecl_name}/README.md
+
 
 %post
 %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
@@ -130,27 +132,20 @@ fi
 
 %check
 : Minimal load test for NTS extension
-cd NTS
 %{_bindir}/php --no-php-ini \
-    --define extension=modules/%{pecl_name}.so \
+    --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
     --modules | grep %{pecl_name}
 
 %if %{with_zts}
 : Minimal load test for ZTS extension
-cd ../ZTS
 %{__ztsphp} --no-php-ini \
-    --define extension=modules/%{pecl_name}.so \
+    --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
     --modules | grep %{pecl_name}
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
-%doc NTS/{LICENSE,README.md}
+%doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 %config(noreplace) %{php_inidir}/%{pecl_name}.ini
 %{php_extdir}/%{pecl_name}.so
@@ -162,6 +157,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Oct 22 2013 Remi Collet <remi@fedoraproject.org> - 1.0.0-3
+- cleanups for review
+- install doc in pecl doc_dir
+
 * Fri Oct 11 2013 Remi Collet <rcollet@redhat.com> - 1.0.0-2
 - allow SCL build