From ef80fa54c8b21788b43e2eb86b3198a7587646fb Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 2 Dec 2020 12:08:16 +0100
Subject: update to 1.0.4

---
 .gitignore           |  2 ++
 REFLECTION           |  2 +-
 php-pecl-mcrypt.spec | 17 ++++++-----------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1ab5c4f..01f0400 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
+clog
 package-*.xml
 *.tgz
+*.tar.bz2
 *.tar.gz
 *.tar.xz
 *.tar.xz.asc
diff --git a/REFLECTION b/REFLECTION
index 88979dc..fe94299 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #117 mcrypt version 1.0.3 ] {
+Extension [ <persistent> extension #117 mcrypt version 1.0.4 ] {
 
   - INI {
     Entry [ mcrypt.algorithms_dir <ALL> ]
diff --git a/php-pecl-mcrypt.spec b/php-pecl-mcrypt.spec
index 1a323cc..56da2d7 100644
--- a/php-pecl-mcrypt.spec
+++ b/php-pecl-mcrypt.spec
@@ -18,16 +18,13 @@
 
 Summary:      Bindings for the libmcrypt library
 Name:         %{?scl_prefix}php-pecl-mcrypt
-Version:      1.0.3
-Release:      4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:      1.0.4
+Release:      1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:      PHP
 URL:          https://pecl.php.net/package/mcrypt
 
 Source:       https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 
-Patch0:       https://github.com/php/pecl-encryption-mcrypt/commit/11de239f9ca99e852a4d94258edf1a9f64f96c8c.patch
-Patch1:       https://github.com/php/pecl-encryption-mcrypt/commit/78a19090593013021ffe6a331b95957d4eadcd23.patch
-
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel > 7.2
 BuildRequires: libmcrypt-devel
@@ -86,19 +83,14 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 %prep 
 %setup -c -q
+mv %{pecl_name}-%{version}%{?prever} NTS
 
 # Don't install/register tests
 sed -e 's/role="test"/role="src"/' \
     %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
     -i package.xml
 
-mv %{pecl_name}-%{version}%{?prever} NTS
 cd NTS
-%if "%{php_version}" > "8.0"
-%patch0 -p1 -b .up0
-%endif
-%patch1 -p1 -b .up1
-
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_MCRYPT_VERSION/{s/.* "//;s/".*$//;p}' php_mcrypt.h)
 if test "x${extver}" != "x%{version}%{?prever}"; then
@@ -231,6 +223,9 @@ fi
 
 
 %changelog
+* Wed Dec  2 2020 Remi Collet <remi@remirepo.net> - 1.0.4-1
+- update to 1.0.4
+
 * Fri Nov 27 2020 Remi Collet <remi@remirepo.net> - 1.0.3-4
 - add upstream patches for PHP 8
 
-- 
cgit