php-pecl-uploadprogress:

- cleanups for Copr
- install doc in pecl doc_dir

1 files changed, 16 insertions, 6 deletions

diff --git a/php-pecl-uploadprogress.spec b/php-pecl-uploadprogress.spec
index ab0b542..8fedfd8 100644
--- a/php-pecl-uploadprogress.spec
+++ b/php-pecl-uploadprogress.spec
@@ -8,7 +8,7 @@
 #
 %{!?php_inidir:  %global php_inidir  %{_sysconfdir}/php.d}
 %{!?__pecl:      %global __pecl      %{_bindir}/pecl}
-%{!?_pkgdocdir:  %global _pkgdocdir  %{_docdir}/%{name}-%{version}}
+%{!?__php:       %global __php       %{_bindir}/php}
 
 %global with_zts  0%{?__ztsphp:1}
 %global pecl_name uploadprogress
@@ -16,7 +16,7 @@
 Summary:        An extension to track progress of a file upload
 Name:           php-pecl-%{pecl_name}
 Version:        1.0.3.1
-Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release:        2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:        PHP
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/%{pecl_name}
@@ -39,9 +39,11 @@ 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
@@ -50,7 +52,7 @@ An extension to track progress of a file upload
 It is only known to work on Apache with mod_php, other SAPI implementations
 unfortunately still have issues.
 
-See %{_pkgdocdir}/examples
+See %{pecl_docdir}/%{pecl_name}/examples
 for a little example.
 
 
@@ -119,10 +121,14 @@ install -D -m 644 package2.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
 
 %if %{with_zts}
 make -C ZTS install INSTALL_ROOT=%{buildroot}
-
 install -D -m 644 %{pecl_name}.ini %{buildroot}%{php_ztsinidir}/%{pecl_name}.ini
 %endif
 
+# Documentation
+for i in LICENSE $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//')
+do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
+done
+
 
 %post
 %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
@@ -137,7 +143,7 @@ fi
 %check
 : Minimal load test for NTS extension
 cd NTS
-%{_bindir}/php --no-php-ini \
+%{__php} --no-php-ini \
     --define extension=modules/%{pecl_name}.so \
     --modules | grep %{pecl_name}
 
@@ -156,7 +162,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc NTS/{LICENSE,examples}
+%doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 %config(noreplace) %{php_inidir}/%{pecl_name}.ini
 %{php_extdir}/%{pecl_name}.so
@@ -168,5 +174,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Nov  5 2013 Remi Collet <remi@fedoraproject.org> - 1.0.3.1-2
+- cleanups for Copr
+- install doc in pecl doc_dir
+
 * Sat Oct 12 2013 Remi Collet <remi@fedoraproject.org> - 1.0.3.1-1
 - initial package, version 1.0.3.1 (stable)