From e92f1bd3a5de63ac96d2f7a19af0bc1a4579f0b4 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Thu, 2 Jul 2015 15:30:19 +0200
Subject: php-tecnickcom-tc-lib-pdf-parser: 2.1.2

---
 .../php-tecnickcom-tc-lib-pdf-parser-pr1.patch     | 22 ----------------------
 .../php-tecnickcom-tc-lib-pdf-parser-pr2.patch     | 22 ----------------------
 .../php-tecnickcom-tc-lib-pdf-parser.spec          | 14 ++++++--------
 3 files changed, 6 insertions(+), 52 deletions(-)
 delete mode 100644 php-tecnickcom-tc-lib-pdf-parser/php-tecnickcom-tc-lib-pdf-parser-pr1.patch
 delete mode 100644 php-tecnickcom-tc-lib-pdf-parser/php-tecnickcom-tc-lib-pdf-parser-pr2.patch

diff --git a/php-tecnickcom-tc-lib-pdf-parser/php-tecnickcom-tc-lib-pdf-parser-pr1.patch b/php-tecnickcom-tc-lib-pdf-parser/php-tecnickcom-tc-lib-pdf-parser-pr1.patch
deleted file mode 100644
index 27e5d88..0000000
--- a/php-tecnickcom-tc-lib-pdf-parser/php-tecnickcom-tc-lib-pdf-parser-pr1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 8933621df1d2bca67701f24f4325254cf7fccd13 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@famillecollet.com>
-Date: Thu, 2 Jul 2015 14:38:26 +0200
-Subject: [PATCH] Fix autoloader
-
----
- resources/autoload.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/resources/autoload.php b/resources/autoload.php
-index 840c889..fdb5a6e 100644
---- a/resources/autoload.php
-+++ b/resources/autoload.php
-@@ -22,7 +22,7 @@ function ($class) {
-             return;
-         }
-         $relative_class = substr($class, $len);
--        $file = dirname(__DIR__).'/'.str_replace('\\', '/', $relative_class).'.php';
-+        $file = dirname(dirname(__DIR__)).'/'.str_replace('\\', '/', $relative_class).'.php';
-         if (file_exists($file)) {
-             require $file;
-         }
diff --git a/php-tecnickcom-tc-lib-pdf-parser/php-tecnickcom-tc-lib-pdf-parser-pr2.patch b/php-tecnickcom-tc-lib-pdf-parser/php-tecnickcom-tc-lib-pdf-parser-pr2.patch
deleted file mode 100644
index 0242702..0000000
--- a/php-tecnickcom-tc-lib-pdf-parser/php-tecnickcom-tc-lib-pdf-parser-pr2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From b8e3ae24efd9f59f78863ca28715df0f9e73fefe Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@famillecollet.com>
-Date: Thu, 2 Jul 2015 14:59:30 +0200
-Subject: [PATCH] Fix PHP < 5.5 compatibility
-
----
- src/Parser.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Parser.php b/src/Parser.php
-index cddba0b..ac3b3ed 100644
---- a/src/Parser.php
-+++ b/src/Parser.php
-@@ -65,7 +65,7 @@ class Parser extends \Com\Tecnick\Pdf\Parser\Process\Xref
-     public function __construct($cfg = array())
-     {
-         if (isset($cfg['ignore_filter_errors'])) {
--            $this->cfg['ignore_filter_errors'] = boolval($cfg['ignore_filter_errors']);
-+            $this->cfg['ignore_filter_errors'] = ($cfg['ignore_filter_errors'] ? true : false);
-         }
-     }
- 
diff --git a/php-tecnickcom-tc-lib-pdf-parser/php-tecnickcom-tc-lib-pdf-parser.spec b/php-tecnickcom-tc-lib-pdf-parser/php-tecnickcom-tc-lib-pdf-parser.spec
index 96ad021..066b325 100644
--- a/php-tecnickcom-tc-lib-pdf-parser/php-tecnickcom-tc-lib-pdf-parser.spec
+++ b/php-tecnickcom-tc-lib-pdf-parser/php-tecnickcom-tc-lib-pdf-parser.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    4e200983f43e6967cda74faa5ec045b9032c009d
+%global gh_commit    f8413619661cf10a9bad7879f2fa730567d37cf9
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global c_vendor     tecnick.com
 %global gh_owner     tecnickcom
@@ -15,7 +15,7 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.1.0
+Version:        2.1.2
 Release:        1%{?dist}
 Summary:        PHP library to parse PDF documents
 
@@ -24,9 +24,6 @@ License:        LGPLv3+
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{?gh_short}.tar.gz
 
-Patch0:         %{name}-pr1.patch
-Patch1:         %{name}-pr2.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 %if %{with_tests}
@@ -60,9 +57,6 @@ The initial source code has been extracted from TCPDF (http://www.tcpdf.org).
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 
-%patch0 -p1
-%patch1 -p1
-
 : Sanity check
 grep -q '^%{version}$' VERSION
 
@@ -115,6 +109,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jul  2 2015 Remi Collet <remi@fedoraproject.org> - 2.1.2-1
+- update to 2.1.2
+- drop patches merged/fixed upstream
+
 * Thu Jul  2 2015 Remi Collet <remi@fedoraproject.org> - 2.1.0-1
 - initial package, version 2.1.0
 - open https://github.com/tecnickcom/tc-lib-pdf-parser/pull/1
-- 
cgit