php-phpseclib: cleanup + backport

2 files changed, 39 insertions, 9 deletions

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..13af741
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+SRCDIR := $(shell pwd)
+NAME := $(shell basename $(SRCDIR))
+include ../../../common/Makefile
+
diff --git a/php-phpseclib.spec b/php-phpseclib.spec
index 15d21be..94b60bd 100644
--- a/php-phpseclib.spec
+++ b/php-phpseclib.spec
@@ -3,27 +3,42 @@
 
 %global github_owner            phpseclib
 %global github_name             phpseclib
+%global github_commit           a74aa9efbe61430fcb60157c8e025a48ec8ff604
+%global github_short            %(c=%{github_commit}; echo ${c:0:7})
+%if 0%{?rhel} == 5
+%global with_tests              0%{?_with_tests:1}
+%else
+%global with_tests              0%{!?_without_tests:1}
+%endif
 
 Name:       php-%{composer_vendor}
 Version:    2.0.0
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    PHP Secure Communications Library
 
 Group:      System Environment/Libraries
 License:    MIT
 URL:        https://github.com/%{github_owner}/%{github_name}
-Source0:    https://github.com/%{github_owner}/%{github_name}/archive/%{version}.tar.gz
+Source0:    %{url}/archive/%{github_commit}/%{name}-%{version}-%{github_short}.tar.gz
 Source1:    %{name}-autoload.php
 
 # https://github.com/phpseclib/phpseclib/commit/2b36d44ded043ac07ee470d0e1e7f785dadcf2c0
 Patch0:     %{name}-Remove-include-statement-from-BigInteger-TestCase.patch
 
-BuildArch:  noarch
+BuildArch:      noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Provides:   php-composer(%{composer_vendor}/%{composer_project}) = %{version}
+%if %{with_tests}
+BuildRequires:  php-composer(symfony/class-loader)
+BuildRequires:  %{_bindir}/phpunit
+BuildRequires:  %{_bindir}/phpab
+# Optional at runtime, to avoid too muck skipped tests
+BuildRequires:  php-bcmath
+BuildRequires:  php-gmp
+BuildRequires:  php-mcrypt
+%endif
 
 Requires:   php(language) >= 5.3.3
-
 Requires:   php-bcmath
 Requires:   php-date
 Requires:   php-gmp
@@ -35,9 +50,8 @@ Requires:   php-standard
 Requires:   php-xml
 Requires:   php-composer(symfony/class-loader)
 
-BuildRequires:  php-composer(symfony/class-loader)
-BuildRequires:  %{_bindir}/phpunit
-BuildRequires:  %{_bindir}/phpab
+Provides:   php-composer(%{composer_vendor}/%{composer_project}) = %{version}
+
 
 %description
 MIT-licensed pure-PHP implementations of an arbitrary-precision integer 
@@ -45,28 +59,40 @@ arithmetic library, fully PKCS#1 (v2.1) compliant RSA, DES, 3DES, RC4,
 Rijndael, AES, Blowfish, Twofish, SSH-1, SSH-2, SFTP, and X.509
 
 %prep
-%setup -qn %{github_name}-%{version}
+%setup -qn %{github_name}-%{github_commit}
 %patch0 -p1
 cp %{SOURCE1} %{composer_vendor}/autoload.php
 
 %build
 
 %install
+rm -rf %{buildroot}
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/php
 cp -pr %{composer_vendor} ${RPM_BUILD_ROOT}%{_datadir}/php
 
+%if %{with_tests}
 %check
 %{_bindir}/phpab --output tests/bootstrap.php tests
 echo 'require "%{buildroot}%{_datadir}/php/%{composer_vendor}/autoload.php";' >> tests/bootstrap.php
 %{_bindir}/phpunit
+%endif
+
+%clean
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %{_datadir}/php/%{composer_vendor}
 %doc AUTHORS CHANGELOG.md composer.json README.md
+%{!?_licensedir:%global license %%doc}
 %license LICENSE
 
 %changelog
+* Sun Sep  6 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-4
+- change source0 to commit reference
+- add BR for better test coverage
+- add needed backport stuff for EL-5 in #remirepo
+
 * Wed Sep 02 2015 François Kooman <fkooman@tuxed.net> - 2.0.0-3
 - apply patch for test to avoid loading class that is now autoloaded