From 22934d27dd9319cbcbaab1d3f6a6dc875f44dacb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 5 Jul 2019 15:51:57 +0200 Subject: fix autoloader --- php-sabre-xml2.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/php-sabre-xml2.spec b/php-sabre-xml2.spec index ddeb09c..e2170c2 100644 --- a/php-sabre-xml2.spec +++ b/php-sabre-xml2.spec @@ -23,7 +23,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: XML library that you may not hate Version: 2.1.2 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD @@ -97,14 +97,16 @@ cat << 'EOF' | tee -a lib/autoload.php // Dependencies \Fedora\Autoloader\Dependencies::required([ [ - '/usr/share/php/Sabre/Uri2/autoload.php', - '/usr/share/php/Sabre/Uri/autoload.php', + '%{_datadir}/php/Sabre/Uri2/autoload.php', + '%{_datadir}/php/Sabre/Uri/autoload.php', ], ]); // Functions -require_once __DIR__ . '/Deserializer/functions.php'; -require_once __DIR__ . '/Serializer/functions.php'; +if (!function_exists('Sabre\\Xml\\Serializer\\enum')) { + require_once __DIR__ . '/Deserializer/functions.php'; + require_once __DIR__ . '/Serializer/functions.php'; +} EOF @@ -152,6 +154,9 @@ exit $ret %changelog +* Fri Jul 5 2019 Remi Collet - 2.1.2-3 +- fix autoloader + * Fri Jul 5 2019 Remi Collet - 2.1.2-2 - fix autoloader for sabre/uri v1 and v2 -- cgit