From e315d8218103666e5ae130cb2eb4da83234021da Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Wed, 1 Jul 2015 17:33:49 +0200
Subject: php-tecnickcom-tc-lib-barcode: 1.1.3

---
 .../php-tecnickcom-tc-lib-barcode-pr2.patch        | 22 ----------------------
 .../php-tecnickcom-tc-lib-barcode.spec             | 13 ++++++-------
 2 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 php-tecnickcom-tc-lib-barcode/php-tecnickcom-tc-lib-barcode-pr2.patch

(limited to 'php-tecnickcom-tc-lib-barcode')

diff --git a/php-tecnickcom-tc-lib-barcode/php-tecnickcom-tc-lib-barcode-pr2.patch b/php-tecnickcom-tc-lib-barcode/php-tecnickcom-tc-lib-barcode-pr2.patch
deleted file mode 100644
index 4116301..0000000
--- a/php-tecnickcom-tc-lib-barcode/php-tecnickcom-tc-lib-barcode-pr2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 1421aa08b9705ebfbef4b6cbbd3575483279a081 Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Wed, 1 Jul 2015 16:41:43 +0200
-Subject: [PATCH] restore php < 5.5 compatibility, fix #1
-
----
- src/Type/Square/QrCode.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Type/Square/QrCode.php b/src/Type/Square/QrCode.php
-index 59da935..12458fc 100644
---- a/src/Type/Square/QrCode.php
-+++ b/src/Type/Square/QrCode.php
-@@ -108,7 +108,7 @@ protected function setParameters()
-         if (!isset($this->params[3])) {
-             $this->params[3] = 1;
-         }
--        $this->case_sensitive = boolval($this->params[3]);
-+        $this->case_sensitive = ($this->params[3] ? true : false);
-     }
- 
-     /**
diff --git a/php-tecnickcom-tc-lib-barcode/php-tecnickcom-tc-lib-barcode.spec b/php-tecnickcom-tc-lib-barcode/php-tecnickcom-tc-lib-barcode.spec
index c8f935c..c309eac 100644
--- a/php-tecnickcom-tc-lib-barcode/php-tecnickcom-tc-lib-barcode.spec
+++ b/php-tecnickcom-tc-lib-barcode/php-tecnickcom-tc-lib-barcode.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    1c92ea2f5d3ae5d2121da85522c6f053cf7bcfd1
+%global gh_commit    a51c78d05cd2df0bb91f3ccc113a18774a299190
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global c_vendor     tecnick.com
 %global gh_owner     tecnickcom
@@ -16,7 +16,7 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        1.1.2
+Version:        1.1.3
 Release:        1%{?dist}
 Summary:        PHP library to manipulate various color representations
 
@@ -25,9 +25,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
 
-# https://github.com/tecnickcom/tc-lib-barcode/pull/2 - php < 5.5 compat
-Patch0:         %{name}-pr2.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 %if %{with_tests}
@@ -76,8 +73,6 @@ Optional dependency: php-pecl-imagick
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 
-%patch0 -p1
-
 : Sanity check
 grep -q '^%{version}$' VERSION
 
@@ -128,6 +123,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jul  1 2015 Remi Collet <remi@fedoraproject.org> - 1.1.3-1
+- update to 1.1.3
+- drop patch merged upstream
+
 * Wed Jul  1 2015 Remi Collet <remi@fedoraproject.org> - 1.1.2-1
 - initial package, version 1.1.2
 - open https://github.com/tecnickcom/tc-lib-barcode/pull/2
-- 
cgit