From 3aa2c07531eda13a4de476a01ecffa3a5d52aa68 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 1 Oct 2020 12:52:27 +0200
Subject: update to 0.7.1 drop patch merged upstream

---
 .gitignore             |  2 ++
 PHPINFO                |  2 +-
 REFLECTION             | 18 +++++++++++++++++-
 php-pecl-translit.spec | 30 +++++++++++++++++-------------
 4 files changed, 37 insertions(+), 15 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/PHPINFO b/PHPINFO
index 533addc..1c887d1 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,4 +2,4 @@
 translit
 
 Transliteration support => enabled
-Version => 0.7.0
+Version => 0.7.1
diff --git a/REFLECTION b/REFLECTION
index cfcc86d..decb6c1 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,9 +1,25 @@
-Extension [ <persistent> extension #111 translit version 0.7.0 ] {
+Extension [ <persistent> extension #117 translit version 0.7.1 ] {
+
+  - Dependencies {
+    Dependency [ iconv (Required) ]
+  }
 
   - Functions {
     Function [ <internal:translit> function transliterate ] {
+
+      - Parameters [4] {
+        Parameter #0 [ <required> string $string ]
+        Parameter #1 [ <required> array $filter_list ]
+        Parameter #2 [ <optional> string $charset_in ]
+        Parameter #3 [ <optional> string $charset_out ]
+      }
+      - Return [ string ]
     }
     Function [ <internal:translit> function transliterate_filters_get ] {
+
+      - Parameters [0] {
+      }
+      - Return [ array ]
     }
   }
 }
diff --git a/php-pecl-translit.spec b/php-pecl-translit.spec
index f8a1995..965e4ca 100644
--- a/php-pecl-translit.spec
+++ b/php-pecl-translit.spec
@@ -19,8 +19,8 @@
 
 Summary:      Transliterates non-latin character sets to latin
 Name:         %{?sub_prefix}php-pecl-%{pecl_name}
-Version:      0.7.0
-Release:      4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Version:      0.7.1
+Release:      1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:      BSD
 URL:          https://pecl.php.net/package/%{pecl_name}
 
@@ -46,19 +46,16 @@ Provides:     %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{releas
 Provides:     %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
 %endif
 
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
+%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 # Other third party repo stuff
-%if "%{php_version}" > "7.2"
-Obsoletes:     php72u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php72w-pecl-%{pecl_name} <= %{version}
-%endif
 %if "%{php_version}" > "7.3"
 Obsoletes:     php73-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php73w-pecl-%{pecl_name} <= %{version}
 %endif
 %if "%{php_version}" > "7.4"
 Obsoletes:     php74-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php74w-pecl-%{pecl_name} <= %{version}
+%endif
+%if "%{php_version}" > "8.0"
+Obsoletes:     php80-pecl-%{pecl_name}  <= %{version}
 %endif
 %endif
 
@@ -88,7 +85,6 @@ mv %{pecl_name}-%{version} NTS
 %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml}
 
 cd NTS
-
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_TRANSLIT_VERSION/{s/.* "//;s/".*$//;p}' php_translit.h)
 if test "x${extver}" != "x%{version}%{?prever}"; then
@@ -177,14 +173,14 @@ fi
 %{__php} -n \
     $DEPMOD \
     -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
-    -m | grep %{pecl_name}
+    -m | grep '^%{pecl_name}$'
 
 %if %{with_zts}
 : Minimal load test for ZTS extension
 %{__ztsphp} -n \
     $DEPMOD \
     -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
-    -m | grep %{pecl_name}
+    -m | grep '^%{pecl_name}$'
 %endif
 
 %if %{with_tests}
@@ -228,7 +224,15 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
-* Mon Feb 24 2020 Remi Collet <remi@remirepo.net> - 0.7.0-1
+* Thu Oct  1 2020 Remi Collet <remi@remirepo.net> - 0.7.1-1
+- update to 0.7.1
+- drop patch merged upstream
+
+* Mon Feb 24 2020 Remi Collet <remi@remirepo.net> - 0.7.0-5
+- add patch for PHP 8 from
+  https://github.com/derickr/pecl-translit/pull/8
+
+* Mon Feb 24 2020 Remi Collet <remi@remirepo.net> - 0.7.0-4
 - update to 0.7.0
 - raise dependency on PHP 7.0
 - sources from PECL
-- 
cgit