Update to 0.2.1

- Remove applied patches that are included in 0.2.1
- Re-add custom include_path and bootstrap for tests
- Add php-cli build dependency
epel9
Shawn Iwinski 8 years ago
parent a7dffe350b
commit 565500a856

1
.gitignore vendored

@ -1,3 +1,4 @@
/php-fedora-autoloader-0.1.1-816e4e59061c592f7480a00c6cd9c16067811c1e.tar.gz /php-fedora-autoloader-0.1.1-816e4e59061c592f7480a00c6cd9c16067811c1e.tar.gz
/php-fedora-autoloader-0.1.2-35f7b52f4682276620369bc4bc1a3a5fef93faad.tar.gz /php-fedora-autoloader-0.1.2-35f7b52f4682276620369bc4bc1a3a5fef93faad.tar.gz
/php-fedora-autoloader-0.2.0-acadcf9f2511ac7b777117eb66728f95faabbe99.tar.gz /php-fedora-autoloader-0.2.0-acadcf9f2511ac7b777117eb66728f95faabbe99.tar.gz
/php-fedora-autoloader-0.2.1-98d5a2ec9389686eec8e185c1d0495ef1a6a75c3.tar.gz

@ -12,8 +12,8 @@
%global github_owner php-fedora %global github_owner php-fedora
%global github_name autoloader %global github_name autoloader
%global github_version 0.2.0 %global github_version 0.2.1
%global github_commit acadcf9f2511ac7b777117eb66728f95faabbe99 %global github_commit 98d5a2ec9389686eec8e185c1d0495ef1a6a75c3
%global composer_vendor fedora %global composer_vendor fedora
%global composer_project autoloader %global composer_project autoloader
@ -32,7 +32,7 @@
Name: php-%{composer_vendor}-%{composer_project} Name: php-%{composer_vendor}-%{composer_project}
Version: %{github_version} Version: %{github_version}
Release: 5%{?github_release}%{?dist} Release: 1%{?github_release}%{?dist}
Summary: Fedora Autoloader Summary: Fedora Autoloader
Group: Development/Libraries Group: Development/Libraries
@ -40,25 +40,22 @@ License: MIT
URL: https://github.com/%{github_owner}/%{github_name} URL: https://github.com/%{github_owner}/%{github_name}
Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
# Remove self-autoload constant and prepend self-autoload PSR-4 register
# https://github.com/php-fedora/autoloader/pull/11
Patch0: %{name}-pull-11.patch
BuildArch: noarch BuildArch: noarch
# Tests # Tests
%if %{with_tests} %if %{with_tests}
BuildRequires: php-cli
## composer.json ## composer.json
BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php(language) >= %{php_min_ver}
BuildRequires: php-composer(phpunit/phpunit) BuildRequires: php-composer(phpunit/phpunit)
BuildRequires: php-composer(theseer/autoload) >= %{phpab_min_ver} BuildRequires: php-composer(theseer/autoload) >= %{phpab_min_ver}
BuildRequires: php-pear BuildRequires: php-pear
## phpcompatinfo (computed from version 0.2.0) ## phpcompatinfo (computed from version 0.2.1)
BuildRequires: php-spl BuildRequires: php-spl
%endif %endif
# composer.json # composer.json
Requires: php(language) >= %{php_min_ver} Requires: php(language) >= %{php_min_ver}
# phpcompatinfo (computed from version 0.2.0) # phpcompatinfo (computed from version 0.2.1)
Requires: php-spl Requires: php-spl
# Composer # Composer
@ -94,9 +91,6 @@ Provides needed tools to build other packages:
%prep %prep
%setup -qn %{github_name}-%{github_commit} %setup -qn %{github_name}-%{github_commit}
: Remove self-autoload constant and prepend self-autoload PSR-4 register
%patch0 -p1
: Set PHP directory in phpab template : Set PHP directory in phpab template
sed "s#___AUTOLOAD_PATH___#'%{phpdir}/Fedora/Autoloader'#" \ sed "s#___AUTOLOAD_PATH___#'%{phpdir}/Fedora/Autoloader'#" \
-i res/phpab/fedora.php.tpl -i res/phpab/fedora.php.tpl
@ -119,7 +113,11 @@ cp -p res/phpab/fedora.php.tpl %{buildroot}%{phpab_template_dir}/
%check %check
%if %{with_tests} %if %{with_tests}
%{_bindir}/phpunit --verbose %{_bindir}/php \
-d include_path=.:%{buildroot}%{phpdir}:%{phpdir}:%{_datadir}/pear \
%{_bindir}/phpunit \
--bootstrap %{buildroot}%{phpdir}/Fedora/Autoloader/autoload.php \
--verbose
%else %else
: Tests skipped : Tests skipped
%endif %endif
@ -139,9 +137,16 @@ cp -p res/phpab/fedora.php.tpl %{buildroot}%{phpab_template_dir}/
%changelog %changelog
* Fri Oct 28 2016 Shawn Iwinski <shawn@iwin.ski> - 0.2.1-1
- Update to 0.2.1
- Remove applied patches that are included in 0.2.1
- Re-add custom include_path and bootstrap for tests
- Add php-cli build dependency
* Thu Oct 27 2016 Shawn Iwinski <shawn@iwin.ski> - 0.2.0-5 * Thu Oct 27 2016 Shawn Iwinski <shawn@iwin.ski> - 0.2.0-5
- Add upstream patch "Remove self-autoload constant and prepend - Add upstream patch "Remove self-autoload constant and prepend
self-autoload PSR-4 register" self-autoload PSR-4 register"
- Remove custom include_path and bootstrap for tests
* Thu Oct 27 2016 Remi Collet <remi@fedoraproject.org> - 0.2.0-4 * Thu Oct 27 2016 Remi Collet <remi@fedoraproject.org> - 0.2.0-4
- workaround when not in global autoloader - workaround when not in global autoloader

@ -1 +1 @@
4e5d726cdc95d6a2560643c4d1173a49 php-fedora-autoloader-0.2.0-acadcf9f2511ac7b777117eb66728f95faabbe99.tar.gz 9c83cafdce843fa87bca8850ccf16a34 php-fedora-autoloader-0.2.1-98d5a2ec9389686eec8e185c1d0495ef1a6a75c3.tar.gz

Loading…
Cancel
Save