From 6fbfd61c08e05217690af6ac73f53888c9f13bd9 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 27 Oct 2015 14:03:59 +0100
Subject: php-liuggio-statsd-php-client: sync with rawhide

---
 autoload.php                               | 21 ---------------------
 php-liuggio-statsd-php-client-autoload.php | 20 ++++++++++++++++++++
 php-liuggio-statsd-php-client.spec         | 19 ++++++++++++-------
 3 files changed, 32 insertions(+), 28 deletions(-)
 delete mode 100644 autoload.php
 create mode 100644 php-liuggio-statsd-php-client-autoload.php

diff --git a/autoload.php b/autoload.php
deleted file mode 100644
index ed6bba9..0000000
--- a/autoload.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-$vendor = '/usr/share/php';
-if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) {
-    if (!class_exists('Symfony\\Component\\ClassLoader\\ClassLoader', false)) {
-        require_once $vendor . '/Symfony/Component/ClassLoader/ClassLoader.php';
-    }
-
-    $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader();
-    $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);
-}
-$fedoraClassLoader->addPrefix('Liuggio\\StatsdClient', dirname(dirname(__DIR__)));
-
-return $fedoraClassLoader;
diff --git a/php-liuggio-statsd-php-client-autoload.php b/php-liuggio-statsd-php-client-autoload.php
new file mode 100644
index 0000000..ad59d20
--- /dev/null
+++ b/php-liuggio-statsd-php-client-autoload.php
@@ -0,0 +1,20 @@
+<?php
+$vendor = '/usr/share/php';
+if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) {
+    if (!class_exists('Symfony\\Component\\ClassLoader\\ClassLoader', false)) {
+        require_once $vendor . '/Symfony/Component/ClassLoader/ClassLoader.php';
+    }
+
+    $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader();
+    $fedoraClassLoader->register();
+}
+
+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
-- 
cgit