[php-pear-File-Bittorrent2] - define metadir, fix FTBFS #914359 - keep doc in /usr/share/doc/pear - add explicit dependencies

[Remi Collet]

commit b227728c06aa1e06c116aa0f405a400eb42ff9d8
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Aug 7 11:41:44 2013 +0200

    - define metadir, fix FTBFS #914359
    - keep doc in /usr/share/doc/pear
    - add explicit dependencies

 php-pear-File-Bittorrent2.spec |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)
---
diff --git a/php-pear-File-Bittorrent2.spec b/php-pear-File-Bittorrent2.spec
index 5e4a08c..2998391 100644
--- a/php-pear-File-Bittorrent2.spec
+++ b/php-pear-File-Bittorrent2.spec
@@ -1,3 +1,4 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %define pear_name File_Bittorrent2
 
@@ -13,13 +14,20 @@ Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Patch0:         php-pear-File-Bittorrent-dos2unix.patch
 # This patch modifies the md5sum in the xml file to match the files
 # after they have been dos2unixed
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2
+BuildRequires:  php-pear
+
 BuildRequires:  dos2unix, php-pear-PHPUnit
+
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
+# from phpcompatinfo report
+Requires:       php-ctype
+Requires:       php-date
+Requires:       php-pcre
+Requires:       php-pear(PEAR)
+
 Provides:       php-pear(%{pear_name}) = %{version}
 
 
@@ -52,26 +60,17 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf $RPM_BUILD_ROOT docdir
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
 
-# Move documentation
-mkdir -p docdir
-mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
-
 
 # Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf $RPM_BUILD_ROOT%{pear_metadir}/.??*
 
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post
 %{__pear} install --nodeps --soft --force --register-only \
     %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
@@ -84,9 +83,7 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
-
+%doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{pear_name}.xml
 # TODO upstream: pear_testdir and pear_datadir; they are currently OK though,
 #c caught by the below glob since they are withing pear_phpdir
@@ -97,6 +94,11 @@ fi
 
 
 %changelog
+* Wed Aug  7 2013 Remi Collet <remi at fedoraproject.org> - 1.3.1-11
+- define metadir, fix FTBFS #914359
+- keep doc in /usr/share/doc/pear
+- add explicit dependencies
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild