summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-liuggio-statsd-php-client-autoload.php (renamed from autoload.php)11
-rw-r--r--php-liuggio-statsd-php-client.spec19
2 files changed, 17 insertions, 13 deletions
diff --git a/autoload.php b/php-liuggio-statsd-php-client-autoload.php
index ed6bba9..ad59d20 100644
--- a/autoload.php
+++ b/php-liuggio-statsd-php-client-autoload.php
@@ -9,13 +9,12 @@ if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Compo
$fedoraClassLoader->register();
}
-if (file_exists( $vendor . '/Monolog/autoload.php')) {
- require_once $vendor . '/Monolog/autoload.php';
-
-} else if (is_dir($vendor . '/Monolog')) {
- $fedoraClassLoader->addPrefix('Monolog', $vendor);
- $fedoraClassLoader->addPrefix('Psr\\Log', $vendor);
+if (is_dir($vendor . '/Monolog')) {
+ $fedoraClassLoader->addPrefix('Monolog', $vendor);
+ $fedoraClassLoader->addPrefix('Psr\\Log', $vendor);
}
$fedoraClassLoader->addPrefix('Liuggio\\StatsdClient', dirname(dirname(__DIR__)));
return $fedoraClassLoader;
+?>
+
diff --git a/php-liuggio-statsd-php-client.spec b/php-liuggio-statsd-php-client.spec
index c7df1ff..0b4f506 100644
--- a/php-liuggio-statsd-php-client.spec
+++ b/php-liuggio-statsd-php-client.spec
@@ -14,10 +14,11 @@ Group: Development/Libraries
License: MIT
URL: https://github.com/liuggio/statsd-php-client
Source0: https://github.com/liuggio/statsd-php-client/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Source1: autoload.php
+Source1: %{name}-autoload.php
-Buildarch: noarch
+BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
# For tests
BuildRequires: php-composer(phpunit/phpunit) >= 4.7
BuildRequires: php-composer(symfony/class-loader)
@@ -43,8 +44,6 @@ written in php.
%prep
%setup -qn statsd-php-client-%{version}
-cp %{SOURCE1} src/Liuggio/StatsdClient/autoload.php
-
%build
@@ -54,12 +53,12 @@ rm -rf %{buildroot}
mkdir -pm 0755 %{buildroot}%{_datadir}/php/Liuggio/StatsdClient
cp -rp src/Liuggio/StatsdClient/* %{buildroot}%{_datadir}/php/Liuggio/StatsdClient
+cp -p %{SOURCE1} %{buildroot}%{_datadir}/php/Liuggio/StatsdClient/autoload.php
%check
-%{_bindir}/phpunit \
- --bootstrap=%{buildroot}%{_datadir}/php/Liuggio/StatsdClient/autoload.php \
- --verbose
+phpunit -v \
+ --bootstrap=%{buildroot}%{_datadir}/php/Liuggio/StatsdClient/autoload.php
%clean
@@ -75,9 +74,15 @@ rm -rf %{buildroot}
%changelog
+* Sat Oct 24 2015 Michael Cronenworth <mike@cchtml.com> - 1.0.18-1
+- version update
+
* Mon Aug 10 2015 Remi Collet <remi@remirepo.net> - 1.0.18-1
- update to 1.0.18
+* Tue Jun 23 2015 Michael Cronenworth <mike@cchtml.com> - 1.0.16-3
+- Fix Requires, install autoloader
+
* Tue Jun 16 2015 Remi Collet <remi@remirepo.net> - 1.0.16-1
- add backport stuff for remirepo
- run test suite during build