summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-04-14 15:28:33 +0200
committerRemi Collet <fedora@famillecollet.com>2016-04-14 15:28:33 +0200
commitbca83ab06543517fc5aef905a91ca3ab16af9982 (patch)
treef4237e8a5264aecbdf45a783a9473028dec0a4bc
parent374e9527f4da754a1645159dbe778aa323aaf981 (diff)
php-Monolog: 1.19
-rw-r--r--php-Monolog.spec26
1 files changed, 17 insertions, 9 deletions
diff --git a/php-Monolog.spec b/php-Monolog.spec
index 38a5d9d..1bd7755 100644
--- a/php-Monolog.spec
+++ b/php-Monolog.spec
@@ -12,8 +12,8 @@
%global github_owner Seldaek
%global github_name monolog
-%global github_version 1.18.2
-%global github_commit 064b38c16790249488e7a8b987acf1c9d7383c09
+%global github_version 1.19.0
+%global github_commit 5f56ed5212dc509c8dc8caeba2715732abb32dbf
%global composer_vendor monolog
%global composer_project monolog
@@ -169,13 +169,17 @@ if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Compo
$fedoraClassLoader->addPrefix('Monolog\\', dirname(__DIR__));
-// Required dependency
-require_once '%{phpdir}/Psr/Log/autoload.php';
-
-// Optional dependencies
-@include_once '%{phpdir}/Aws/autoload.php';
-@include_once '%{phpdir}/Raven/autoload.php';
-@include_once '%{phpdir}/Swift/swift_required.php';
+// Dependencies (autoloader => required)
+foreach(array(
+ '%{phpdir}/Psr/Log/autoload.php' => true,
+ '%{phpdir}/Aws/autoload.php' => false,
+ '%{phpdir}/Raven/autoload.php' => false,
+ '%{phpdir}/Swift/swift_required.php' => false,
+) as $dependencyAutoloader => $required) {
+ if ($required || file_exists($dependencyAutoloader)) {
+ require_once $dependencyAutoloader;
+ }
+}
return $fedoraClassLoader;
AUTOLOAD
@@ -249,6 +253,10 @@ rm -rf %{buildroot}
%changelog
+* Thu Apr 14 2016 Remi Collet <remi@remirepo.net> - 1.19.0-1
+- update to 1.19.0
+- updated autoloader dependency loading
+
* Mon Apr 04 2016 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.18.2-1
- Updated to 1.18.2 (RHBZ #1313579)
- Removed patch (accepted upstream and applied to this version)