diff --git a/.gitignore b/.gitignore index af7e2f6..12a8dcc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /mongo-php-adapter-1.0.6-6ebf808.tar.gz /mongo-php-adapter-1.0.7-57bbf53.tar.gz /mongo-php-adapter-1.0.8-592ecd7.tar.gz +/mongo-php-adapter-1.0.9-fea3f83.tar.gz diff --git a/php-alcaeus-mongo-php-adapter.spec b/php-alcaeus-mongo-php-adapter.spec index 505191d..747142f 100644 --- a/php-alcaeus-mongo-php-adapter.spec +++ b/php-alcaeus-mongo-php-adapter.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 592ecd7754e1263b5c120fd186bc95af921233ec +%global gh_commit fea3f8333c7b22dde97d7dbe8a82528fc5c27992 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner alcaeus %global gh_project mongo-php-adapter @@ -17,7 +17,7 @@ Name: php-%{gh_owner}-%{gh_project} -Version: 1.0.8 +Version: 1.0.9 Release: 1%{?dist} Summary: Mongo PHP Adapter @@ -27,7 +27,7 @@ URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{?gh_short}.tar.gz BuildArch: noarch -BuildRequires: php-composer(theseer/autoload) +BuildRequires: php-fedora-autoloader-devel BuildRequires: php(language) >= 5.5 %if %{with_tests} BuildRequires: php-hash @@ -54,6 +54,8 @@ Requires: php-date Requires: php-mbstring Requires: php-pcre Requires: php-spl +# Autoloader +Requires: php-composer(fedora/autoloader) # Composer Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} @@ -80,15 +82,16 @@ mv lib/Mongo lib/%{ns_vendor}/Mongo %build : Create a classmap autoloader %{_bindir}/phpab \ + --template fedora \ --output lib/%{ns_vendor}/MongoDbAdapter/autoload.php \ lib/%{ns_vendor} cat << 'EOF' | tee -a lib/%{ns_vendor}/MongoDbAdapter/autoload.php -require_once dirname(__DIR__) . '/Mongo/functions.php'; - -// Dependencies -require_once "%{_datadir}/php/MongoDB/autoload.php"; +\Fedora\Autoloader\Dependencies::required(array( + dirname(__DIR__) . '/Mongo/functions.php', + '%{_datadir}/php/MongoDB/autoload.php', +)); EOF @@ -147,6 +150,10 @@ exit $ret %changelog +* Sun Jan 29 2017 Remi Collet - 1.0.9-1 +- update to 1.0.9 +- switch to fedora autoloader + * Thu Jan 12 2017 Remi Collet - 1.0.8-1 - update to 1.0.8 diff --git a/sources b/sources index d45122d..aa49ebd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mongo-php-adapter-1.0.8-592ecd7.tar.gz) = 34fa42a9c98283d68b353fb01bb30c7cd8026e14d3feebf6f6b43059e62d16b0cfd143ac01b0971a96302869b06a73a287364f797cb54825669903b8ad817c3b +SHA512 (mongo-php-adapter-1.0.9-fea3f83.tar.gz) = 4f5ffdd5205108465c077fbb4dd1a09329b3d64aafdcdbd7a747592ede4e25dde41be51447be905b23afa5d49aa8a1efb67564f4a1ef1b7c68d1b7b214061040