[php-xmpphp] - fix dependencies - move tests in /usr/share/tests (outside include_path)

[Remi Collet]

commit 2b312ac40ad29f3ac02fdc7afe2d0e3a031803cc
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Jan 30 19:45:48 2013 +0100

    - fix dependencies
    - move tests in /usr/share/tests (outside include_path)

 .gitignore      |    2 +
 php-xmpphp.spec |   56 +++++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 42 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4d1ca50..b30c203 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+clog
+*spec~
 xmpphp-0.1rc2-r77.tgz
diff --git a/php-xmpphp.spec b/php-xmpphp.spec
index 0cdb5f7..cc88999 100644
--- a/php-xmpphp.spec
+++ b/php-xmpphp.spec
@@ -5,17 +5,28 @@
 
 Name:           php-%{realname}
 Version:        0.1
-Release:        0.10.%{relcand}_%{prerelease}%{?dist}
+Release:        0.11.%{relcand}.%{prerelease}%{?dist}
 Summary:        XMPPHP is the successor to Class.Jabber.PHP
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://code.google.com/p/xmpphp/
 Source0:        http://xmpphp.googlecode.com/files/%{realname}-%{version}%{relcand}-%{prerelease}.tgz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-Requires:       php
+
+Requires:       php-curl
+Requires:       php-date
+Requires:       php-dom
+Requires:       php-mbstring
+Requires:       php-pcre
+Requires:       php-session
+Requires:       php-simplexml
+Requires:       php-spl
+Requires:       php-xml
+%{?fedora:Requires: php-ereg}
+
 
 %description
 XMPPHP is the successor to Class.Jabber.PHP which can connect to XMPP
@@ -23,36 +34,49 @@ XMPPHP is the successor to Class.Jabber.PHP which can connect to XMPP
 several XML processing approaches and supported styles, persistent
 connection, etc.
 
+
 %prep
 %setup -qn %{realname}-%{version}%{relcand}-%{prerelease}
 
+
 %build
 # Empty build
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
+# Tests
+mkdir -p %{buildroot}%{_datadir}/tests/%{realname}/%{REALNAME}
+install -p -m 644 tests/*.php             %{buildroot}%{_datadir}/tests/%{realname}/
+install -p -m 644 tests/%{REALNAME}/*.php %{buildroot}%{_datadir}/tests/%{realname}/%{REALNAME}/
+
+# Library
+mkdir -p %{buildroot}%{_datadir}/php/%{realname}
+install -p -m 644 %{REALNAME}/*.php %{buildroot}%{_datadir}/php/%{realname}/
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/php/%{realname}/tests/%{REALNAME}
-install -p -m 644 tests/*.php $RPM_BUILD_ROOT%{_datadir}/php/%{realname}/tests/
-install -p -m 644 tests/%{REALNAME}/*.php $RPM_BUILD_ROOT%{_datadir}/php/%{realname}/tests/%{REALNAME}/
+# Examples (for doc)
+mkdir examples
+cp -p *.php examples
 
-install -p -m 644 %{REALNAME}/*.php $RPM_BUILD_ROOT%{_datadir}/php/%{realname}/
-mkdir examples ; cp *.php examples
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
 
 %files
 %defattr(-,root,root,-)
 %doc README LICENSE examples
-%{_datadir}/php/%{realname}/*.php
-%dir %{_datadir}/php/%{realname}
-%dir %{_datadir}/php/%{realname}/tests
-%dir %{_datadir}/php/%{realname}/tests/%{REALNAME}
-%{_datadir}/php/%{realname}/tests/*.php
-%{_datadir}/php/%{realname}/tests/%{REALNAME}/*.php
+%{_datadir}/php/%{realname}
+%dir %{_datadir}/tests
+%{_datadir}/tests/%{realname}
+
 
 %changelog
+* Wed Jan 30 2013 Remi Collet <remi at fedoraproject.org> - 0.1-0.11.rc2.r77
+- fix dependencies
+- move tests in /usr/share/tests (outside include_path)
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-0.10.rc2_r77
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild