v4.1.3HEADmaster

4 files changed, 38 insertions, 21 deletions

diff --git a/PHPINFO b/PHPINFO
new file mode 100644
index 0000000..ade84b1
--- /dev/null
+++ b/PHPINFO
@@ -0,0 +1,6 @@
+
+PDFlib
+
+PDFlib Support => enabled
+pdflib extension version => 4.1.3
+pdflib-lite library version => 7.0.5
diff --git a/REFLECTION b/REFLECTION
index 5f2536f..d727a3d 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #181 PDFlib version 4.1.2 ] {
+Extension [ <persistent> extension #200 PDFlib version 4.1.3 ] {
 
   - Functions {
     Function [ <internal:PDFlib> function pdf_activate_item ] {
diff --git a/pdflib-phpinfo.patch b/pdflib-phpinfo.patch
new file mode 100644
index 0000000..a343da2
--- /dev/null
+++ b/pdflib-phpinfo.patch
@@ -0,0 +1,18 @@
+diff -up ./pdf.c.old ./pdf.c
+--- ./pdf.c.old	2019-09-16 14:50:34.349661071 +0200
++++ ./pdf.c	2019-09-16 14:49:35.122885536 +0200
+@@ -383,12 +383,8 @@ PHP_MINFO_FUNCTION(PDFlib)
+ {
+     php_info_print_table_start();
+     php_info_print_table_header(2, "PDFlib Support", "enabled" );
+-#ifdef PDF_FEATURE_INTERNAL
+-    php_info_print_table_row(2, "PHP extension built by PDFlib GmbH", PDFLIB_VSTRING);
+-#else /* PDF_FEATURE_INTERNAL */
+-    php_info_print_table_row(2, "PHP extension built with PECL",  PDFLIB_VSTRING);
+-    php_info_print_table_row(2, "PECL Version", PHP_PDFLIB_VERSION);
+-#endif /* PDF_FEATURE_INTERNAL */
++    php_info_print_table_row(2, "pdflib extension version", PHP_PDFLIB_VERSION);
++    php_info_print_table_row(2, "pdflib-lite library version",  PDFLIB_VSTRING);
+     php_info_print_table_end();
+ }
+ /* }}} */
diff --git a/php-pecl-pdflib.spec b/php-pecl-pdflib.spec
index b91fb77..711a141 100644
--- a/php-pecl-pdflib.spec
+++ b/php-pecl-pdflib.spec
@@ -19,13 +19,15 @@
 
 Summary:        Package for generating PDF files
 Name:           %{?scl_prefix}php-pecl-pdflib
-Version:        4.1.2
-Release:        5%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Version:        4.1.3
+Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 # https://bugs.php.net/60396 ask license file
 License:        PHP
 URL:            http://pecl.php.net/package/pdflib
 
-Source0:        http://pecl.php.net/get/pdflib-%{version}.tgz
+Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
+
+Patch0:         %{pecl_name}-phpinfo.patch
 
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel >= 5.4
@@ -53,22 +55,6 @@ Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{rele
 
 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 # Other third party repo stuff
-Obsoletes:     php53-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php53u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php54-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php54w-pecl-%{pecl_name} <= %{version}
-%if "%{php_version}" > "5.5"
-Obsoletes:     php55u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php55w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "5.6"
-Obsoletes:     php56u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.0"
-Obsoletes:     php70u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php70w-pecl-%{pecl_name} <= %{version}
-%endif
 %if "%{php_version}" > "7.1"
 Obsoletes:     php71u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php71w-pecl-%{pecl_name} <= %{version}
@@ -101,12 +87,16 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 %prep
 %setup -c -q
 
+pushd %{pecl_name}-%{version}
+%patch0 -p1 -b .rpm
+
 # Check version
-extver=$(sed -n '/#define PHP_PDFLIB_VERSION/{s/.* "//;s/".*$//;p}' %{pecl_name}-%{version}/php_pdflib.h)
+extver=$(sed -n '/#define PHP_PDFLIB_VERSION/{s/.* "//;s/".*$//;p}' php_pdflib.h)
 if test "x${extver}" != "x%{version}"; then
    : Error: Upstream version is ${extver}, expecting %{version}.
    exit 1
 fi
+popd
 
 %if %{with_zts}
 cp -pr %{pecl_name}-%{version} %{pecl_name}-zts
@@ -206,6 +196,9 @@ fi
 
 
 %changelog
+* Mon Sep 16 2019 Remi Collet <remi@remirepo.net> - 4.1.3-1
+- update to 4.1.3
+
 * Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 4.1.2-5
 - rebuild for 7.4.0RC1