https://bugzilla.redhat.com/show_bug.cgi?id=1356552 Remi Collet <fedora@xxxxxxxxxxxxxxxxx> changed: What |Removed |Added ---------------------------------------------------------------------------- Flags|fedora-review? |fedora-review+ --- Comment #15 from Remi Collet <fedora@xxxxxxxxxxxxxxxxx> --- --- php-onelogin-php-saml.spec.0 2016-07-20 13:37:25.000000000 +0200 +++ php-onelogin-php-saml.spec 2016-07-25 17:07:35.000000000 +0200 @@ -2,18 +2,22 @@ %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner onelogin %global gh_project php-saml +%global php_vendor OneLogin %global php_minver 5.3.2 Name: php-%{gh_owner}-%{gh_project} Version: 2.9.1 -Release: 1%{?dist} +Release: 3%{?dist} Summary: SAML support for PHP License: MIT URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{url}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz +# Patch the test bootstrap for our autoload.php rather than adjust in %%check to simplify spec +Patch0: php-saml-bootstrap-autoloader.patch + BuildArch: noarch BuildRequires: php(language) >= %{php_minver} @@ -28,19 +32,36 @@ # From composer.json, "require": { # "php": ">=5.3.2" Requires: php(language) >= %{php_minver} +Requires: php-openssl +Requires: php-dom + # From manual unbundling, needs 1.4 contrary to the bundled 2.0 due to namespace issues Requires: php-composer(robrichards/xmlseclibs) >= 1.4.1 Requires: php-composer(robrichards/xmlseclibs) < 2.0.0 -Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} -# Uses the mcrypt algorithms +# From phpci analysis +Requires: php-date +Requires: php-filter +Requires: php-hash +Requires: php-libxml +Requires: php-pcre +Requires: php-session +Requires: php-zlib + + +Suggests: php-gettext + +# Uses the mcrypt algorithms which is a suggests in xmlseclibs Requires: php-mcrypt +Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} + + %description OneLogin's SAML PHP toolkit let you build a SP (Service Provider) over your PHP application and connect it to any IdP (Identity Provider). -Autoloader: %{_datadir}/php/%{gh_project}/autoload.php +Autoloader: %{_datadir}/php/%{php_vendor}/Saml2/autoload.php %prep @@ -50,27 +71,22 @@ %build rm -rf extlib : Generate autoloader -%{_bindir}/phpab -n --output lib/autoload.php lib +%{_bindir}/phpab -n --output lib/Saml2/autoload.php lib # Append the xmlseclibs requirement not in composer -cat >> lib/autoload.php <<EOF +cat >> lib/Saml2/autoload.php <<EOF require_once "%{_datadir}/php/robrichards-xmlseclibs/autoload.php"; EOF %install -mkdir -p %{buildroot}%{_datadir}/php/%{gh_project} -cp -pr lib/* %{buildroot}%{_datadir}/php/%{gh_project}/ +mkdir -p %{buildroot}%{_datadir}/php/%{php_vendor} +cp -pr lib/* %{buildroot}%{_datadir}/php/%{php_vendor}/ %check -: Run upstream tests -# Use our autoloader in tests -sed -i 's#_toolkit_loader.php#lib/autoload.php#' tests/bootstrap.php -# Drop the bundled xmlseclibs from being used in bootstrap -sed -i '/XMLSECLIBS_DIR/d' tests/bootstrap.php -: Run phpunit tests in dev mode +: Run upstream phpunit tests in dev mode %{_bindir}/php -c %{_docdir}/php/php.ini-development %{_bindir}/phpunit --verbose --debug --bootstrap tests/bootstrap.php --configuration tests/phpunit.xml -: Run phpunit tests in system settings mode +: Run upstream phpunit tests in system settings mode %{_bindir}/php %{_bindir}/phpunit --verbose --debug --bootstrap tests/bootstrap.php --configuration tests/phpunit.xml @@ -79,11 +95,17 @@ %files %license LICENSE -%doc advanced_settings_example.php settings_example.php README.md composer.json -%{_datadir}/php/%{gh_project} +%doc advanced_settings_example.php settings_example.php README.md composer.json CHANGELOG +%{_datadir}/php/%{php_vendor} %changelog +* Mon Jul 25 2016 James Hogarth <james.hogarth@xxxxxxxxx> - 2.9.1-3 +- Switch to a single autoloader after feedback + +* Mon Jul 25 2016 James Hogarth <james.hogarth@xxxxxxxxx> - 2.9.1-2 +- Update spec with comments from review + * Wed Jul 20 2016 James Hogarth <james.hogarth@xxxxxxxxx> - 2.9.1-1 - update to 2.9.1 [x]: Requires correct, justified where necessary. [x]: Package complies to the Packaging Guidelines [x]: Please add CHANGELOG as %doc Everything is now OK. It seems the "--debug" option is not needed (create lof ot output lines) === APPROVED === -- You are receiving this mail because: You are on the CC list for the bug. You are always notified about changes to this product and component _______________________________________________ package-review mailing list package-review@xxxxxxxxxxxxxxxxxxxxxxx https://lists.fedoraproject.org/admin/lists/package-review@xxxxxxxxxxxxxxxxxxxxxxx