php-Monolog: 1.4.1 (backport)

1 files changed, 109 insertions, 34 deletions

diff --git a/php-Monolog.spec b/php-Monolog.spec
index 13f2297..28d847f 100644
--- a/php-Monolog.spec
+++ b/php-Monolog.spec
@@ -1,46 +1,73 @@
-%global libname Monolog
+%global github_owner   Seldaek
+%global github_name    monolog
+%global github_version 1.4.1
+%global github_commit  3295de82be06b3bbcd336983ddf8c50724430180
 
-Name:      php-%{libname}
-Version:   1.2.1
+%global lib_name       Monolog
+
+%global php_min_ver    5.3.0
+%global psrlog_min_ver 1.0
+%global psrlog_max_ver 2.0
+
+Name:      php-%{lib_name}
+Version:   %{github_version}
 Release:   1%{?dist}
-Summary:   Logging for PHP 5.3
+Summary:   Sends your logs to files, sockets, inboxes, databases and various web services
 
 Group:     Development/Libraries
 License:   MIT
-URL:       https://github.com/Seldaek/monolog
-Source0:   %{url}/archive/%{version}.tar.gz
-
-BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
-
-Requires:  php-common >= 5.3.0
-Requires:  php-pear(pear.swiftmailer.org/Swift)
-# phpci requires
-Requires:  php-curl
-Requires:  php-date
-Requires:  php-json
-Requires:  php-libxml
-Requires:  php-pcre
-Requires:  php-sockets
-Requires:  php-spl
-Requires:  php-filter
+URL:       https://github.com/%{github_owner}/%{github_name}
+Source0:   %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
+
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:     noarch
+BuildRequires: php-common >= %{php_min_ver}
+BuildRequires: php-pear(pear.phpunit.de/PHPUnit)
+BuildRequires: php-PsrLog >= %{psrlog_min_ver}
+BuildRequires: php-PsrLog <  %{psrlog_max_ver}
+
+Requires:      php-common >= %{php_min_ver}
+Requires:      php-PsrLog >= %{psrlog_min_ver}
+Requires:      php-PsrLog <  %{psrlog_max_ver}
+Requires:      php-pear(pear.swiftmailer.org/Swift)
+# phpci
+Requires:      php-curl
+Requires:      php-date
+Requires:      php-json
+Requires:      php-libxml
+Requires:      php-pcre
+Requires:      php-sockets
+Requires:      php-spl
+Requires:      php-filter
 
 %description
-%{summary}.
+Monolog sends your logs to files, sockets, inboxes, databases and various web
+services. Special handlers allow you to build advanced logging strategies.
+
+This library implements the PSR-3 [1] interface that you can type-hint against
+in your own libraries to keep a maximum of interoperability. You can also use it
+in your applications to make sure you can always use another compatible logger
+at a later time.
 
 Optional packages:
-* php-%{libname}-amqp
+* %{name}-amqp
       Allow sending log messages to an AMQP server (1.0+ required)
-* php-%{libname}-mongo
+* %{name}-mongo
       Allow sending log messages to a MongoDB server
+* %{name}-raven
+      Allow sending log messages to a Sentry server
+* https://github.com/doctrine/couchdb-client
+      Allow sending log messages to a CouchDB server
 * https://github.com/mlehner/gelf-php
       Allow sending log messages to a GrayLog2 server
 
+[1] https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md
+
 
 %package amqp
 Summary:  Monolog AMQP handler
 Group:    Development/Libraries
-Requires: php-%{libname} = %{version}-%{release}
+Requires: php-%{lib_name} = %{version}-%{release}
 Requires: php-pecl(amqp)
 
 %description amqp
@@ -50,15 +77,39 @@ Allow sending log messages to an AMQP server (1.0+ required).
 %package mongo
 Summary:  Monolog MongoDB handler
 Group:    Development/Libraries
-Requires: php-%{libname} = %{version}-%{release}
+Requires: php-%{lib_name} = %{version}-%{release}
 Requires: php-pecl(mongo)
 
 %description mongo
 Allow sending log messages to a MongoDB server.
 
 
+%package raven
+Summary:  Monolog Sentry handler
+Group:    Development/Libraries
+Requires: php-%{lib_name} = %{version}-%{release}
+Requires: php-Raven >= 0.3.0
+#Requires: php-Raven <  0.4.0
+Provides: %{name}-Raven = %{version}-%{release}
+
+%description raven
+Allow sending log messages to a Sentry server.
+
+
 %prep
-%setup -q -n monolog-%{version}
+%setup -q -n %{github_name}-%{github_commit}
+
+# Rewrite tests' bootstrap
+( cat <<'AUTOLOAD'
+<?php
+set_include_path(get_include_path() . PATH_SEPARATOR . __DIR__);
+
+spl_autoload_register(function ($class) {
+    $src = str_replace(array('\\', '_'), '/', $class).'.php';
+    @include_once $src;
+});
+AUTOLOAD
+) > ./tests/bootstrap.php
 
 
 %build
@@ -66,27 +117,51 @@ Allow sending log messages to a MongoDB server.
 
 
 %install
-mkdir -p -m 755 %{buildroot}%{_datadir}/php/%{libname}
-cp -pr src/%{libname} %{buildroot}%{_datadir}/php/
+mkdir -p -m 755 %{buildroot}%{_datadir}/php/%{lib_name}
+cp -pr ./src/%{lib_name} %{buildroot}%{_datadir}/php/
+
+
+%check
+%{_bindir}/phpunit \
+    -d include_path="./src:./tests:.:%{_datadir}/php:%{pear_phpdir}" \
+    -d date.timezone="UTC" \
+    -c ./phpunit.xml.dist
 
 
 %files
 %defattr(-,root,root,-)
 %doc LICENSE *.mdown doc composer.json
-%{_datadir}/php/%{libname}
-%exclude %{_datadir}/php/%{libname}/Handler/MongoDBHandler.php
-%exclude %{_datadir}/php/%{libname}/Handler/AmqpHandler.php
+%{_datadir}/php/%{lib_name}
+%exclude %{_datadir}/php/%{lib_name}/Handler/AmqpHandler.php
+%exclude %{_datadir}/php/%{lib_name}/Handler/MongoDBHandler.php
+%exclude %{_datadir}/php/%{lib_name}/Handler/RavenHandler.php
 
 %files amqp
 %defattr(-,root,root,-)
-%{_datadir}/php/%{libname}/Handler/AmqpHandler.php
+%{_datadir}/php/%{lib_name}/Handler/AmqpHandler.php
 
 %files mongo
 %defattr(-,root,root,-)
-%{_datadir}/php/%{libname}/Handler/MongoDBHandler.php
+%{_datadir}/php/%{lib_name}/Handler/MongoDBHandler.php
+
+%files raven
+%defattr(-,root,root,-)
+%{_datadir}/php/%{lib_name}/Handler/RavenHandler.php
 
 
 %changelog
+* Tue Apr  2 2013 Remi Collet <RPMS@famillecollet.com> 1.4.1-1
+- backport 1.4.1 for remi repo
+
+* Mon Apr 01 2013 Shawn Iwinski <shawn.iwinski@gmail.com> 1.4.1-1
+- Updated to version 1.4.1
+- Updates for "new" Fedora GitHub guidelines
+- Updated summary and description
+- Added php-PsrLog require
+- Added tests (%%check)
+- Removed tests sub-package
+- Added raven sub-package
+
 * Sun Nov 25 2012 Remi Collet <RPMS@famillecollet.com> 1.2.1-1
 - backport 1.2.1 for remi repo