diff --git a/.gitignore b/.gitignore index 2c850b0..3fcf4c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ clog /php-doctrine-migrations-1.8.1-215438c.tgz /php-doctrine-migrations-2.0.0-0101f5b.tgz +/php-doctrine-migrations-2.0.1-2d5c114.tgz diff --git a/php-doctrine-migrations-tests.patch b/php-doctrine-migrations-tests.patch deleted file mode 100644 index 6b412ef..0000000 --- a/php-doctrine-migrations-tests.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f641baab3de3b03e6c86448b5d9b5ad916f20fff Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Wed, 27 Mar 2019 13:46:06 +0100 -Subject: [PATCH] allow "float" in formatBytes to work on 32-bit computers - ---- - lib/Doctrine/Migrations/Tools/BytesFormatter.php | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/Doctrine/Migrations/Tools/BytesFormatter.php b/lib/Doctrine/Migrations/Tools/BytesFormatter.php -index 91caabd05..d828fdc27 100644 ---- a/lib/Doctrine/Migrations/Tools/BytesFormatter.php -+++ b/lib/Doctrine/Migrations/Tools/BytesFormatter.php -@@ -17,7 +17,7 @@ - */ - final class BytesFormatter - { -- public static function formatBytes(int $size, int $precision = 2) : string -+ public static function formatBytes(float $size, int $precision = 2) : string - { - $base = log($size, 1024); - $suffixes = ['', 'K', 'M', 'G', 'T']; diff --git a/php-doctrine-migrations.spec b/php-doctrine-migrations.spec index b6cd991..806809a 100644 --- a/php-doctrine-migrations.spec +++ b/php-doctrine-migrations.spec @@ -8,7 +8,7 @@ # %global bootstrap 0 -%global gh_commit 0101f5bd7f4e5043bf8630db2930f8fd7da552b6 +%global gh_commit 2d5c1141e91833ae706d5611cb74c56cdc7a7402 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner doctrine %global gh_project migrations @@ -25,8 +25,8 @@ %endif Name: php-%{pk_vendor}-%{pk_project} -Version: 2.0.0 -Release: 2%{?dist} +Version: 2.0.1 +Release: 1%{?dist} Summary: PHP Doctrine Migrations project License: MIT @@ -36,7 +36,6 @@ Source1: makesrc.sh # get rid of ocramius/package-versions Patch0: %{name}-rpm.patch -Patch1: %{name}-tests.patch BuildArch: noarch BuildRequires: php-fedora-autoloader-devel @@ -124,7 +123,6 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch1 -p1 : Cleanup to get rid of ocramius/package-versions %patch0 -p1 -b .rpm @@ -222,6 +220,10 @@ exit $ret %changelog +* Wed Apr 24 2019 Remi Collet - 2.0.1-1 +- update to 2.0.1 +- drop patch merged upstream + * Thu Mar 28 2019 Remi Collet - 2.0.0-2 - add patch for 32-bit from https://github.com/doctrine/migrations/pull/803 diff --git a/sources b/sources index d40db29..82acf61 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-doctrine-migrations-2.0.0-0101f5b.tgz) = 5c5e9def5239158c876640a6f8da52977b537375378bea8cc636f706ebadbd7ebc8fdd5e85ab8a8f8f3ca7faef4a77d7c27334249828f5cc0219d934c31980f6 +SHA512 (php-doctrine-migrations-2.0.1-2d5c114.tgz) = ebe731fe7b9d097e14e3ccb6dbe0ab11ca55ef4e8f5d5abe90fc45f874e74e19a0a03e8b68a9978b7d871717ce426b6500146e5adbf7c94747f4ab6a3e0b050c