summaryrefslogtreecommitdiffstats
path: root/php-Pimple.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-11-21 15:46:50 +0100
committerRemi Collet <fedora@famillecollet.com>2013-11-21 15:46:50 +0100
commit8ffb9c71a3d04d91acd2cc9504ace4a286ea8848 (patch)
treec0861872c53adee9b3e370650c10cc906cf060b2 /php-Pimple.spec
parent2c25b2d39ce1ffc655d721985fff2dc493d6599f (diff)
php-Pimple: sync with rawhide
Diffstat (limited to 'php-Pimple.spec')
-rw-r--r--php-Pimple.spec24
1 files changed, 11 insertions, 13 deletions
diff --git a/php-Pimple.spec b/php-Pimple.spec
index dfcbc1e..e08226c 100644
--- a/php-Pimple.spec
+++ b/php-Pimple.spec
@@ -7,7 +7,7 @@
Name: php-%{github_name}
Version: %{github_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A simple dependency injection container for PHP
Group: Development/Libraries
@@ -30,11 +30,6 @@ Requires: php-spl
Pimple is a small dependency injection container for PHP that consists of
just one file and one class.
-NOTE: %{_datadir}/php/%{github_name}/%{github_name}.php is provided for legacy
- (pre PSR-0 packaging guidelines update) compatibility
- and will be removed in version 2. Please use PSR-0
- compliant %{_datadir}/php/%{github_name}.php instead.
-
%prep
%setup -q -n %{github_name}-%{github_commit}
@@ -45,26 +40,29 @@ NOTE: %{_datadir}/php/%{github_name}/%{github_name}.php is provided for legacy
%install
-mkdir -pm 755 %{buildroot}%{_datadir}/php
-cp -p lib/Pimple.php %{buildroot}%{_datadir}/php/
+mkdir -p -m 755 %{buildroot}%{_datadir}/php/%{github_name}
+cp -pr lib/* %{buildroot}%{_datadir}/php/%{github_name}/
-# Legacy (pre PSR-0 packaging guidelines update)
-mkdir -pm 755 %{buildroot}%{_datadir}/php/%{github_name}
-ln -s ../Pimple.php %{buildroot}%{_datadir}/php/%{github_name}/Pimple.php
%check
-%{_bindir}/phpunit -d include_path="./lib:./tests:%{pear_phpdir}"
+%{_bindir}/phpunit --include-path="./lib:./tests"
%files
%defattr(-,root,root,-)
%doc LICENSE README.rst composer.json
%{_datadir}/php/%{github_name}
-%{_datadir}/php/Pimple.php
%changelog
+* Thu Nov 21 2013 Remi Collet <remi@fedoraproject.org> - 1.1.0-4
+- sync remi repo with rawhide
+
+* Thu Nov 21 2013 Shawn Iwinski <shawn.iwinski@gmail.com> 1.1.0-4
+- Reverted invalid PSR-0
+- Updated %%check to use PHPUnit's "--include-path" option
+
* Sat Nov 16 2013 Remi Collet <remi@fedoraproject.org> - 1.1.0-3
- backport 1.1.0 for remi repo.