summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-01-07 15:53:47 +0100
committerRemi Collet <fedora@famillecollet.com>2015-01-07 15:53:47 +0100
commit7ccea6184c17203d8c07d18438b0a5ecb936fad0 (patch)
tree3ed2dc911af2d2023a30c25c23a37a4b64d52cd4
parent0f34663741ee695ef5813db6f0e889ceacda9705 (diff)
php-horde-Horde-Idna: 1.0.1
-rw-r--r--Horde_Idna-rpm.patch10
-rw-r--r--php-horde-Horde-Idna.spec7
2 files changed, 10 insertions, 7 deletions
diff --git a/Horde_Idna-rpm.patch b/Horde_Idna-rpm.patch
index 70a6f84..db6a616 100644
--- a/Horde_Idna-rpm.patch
+++ b/Horde_Idna-rpm.patch
@@ -1,12 +1,12 @@
-diff -up lib/Horde/Idna.php.rpm lib/Horde/Idna.php
---- lib/Horde/Idna.php.rpm 2015-01-07 12:15:14.000000000 +0100
-+++ lib/Horde/Idna.php 2015-01-07 12:17:02.000000000 +0100
+diff -up Horde_Idna-1.0.1/lib/Horde/Idna.php.rpm Horde_Idna-1.0.1/lib/Horde/Idna.php
+--- Horde_Idna-1.0.1/lib/Horde/Idna.php.rpm 2015-01-07 15:51:42.711626839 +0100
++++ Horde_Idna-1.0.1/lib/Horde/Idna.php 2015-01-07 15:51:49.339651276 +0100
@@ -62,11 +62,7 @@ class Horde_Idna
{
if (!isset(self::$_backend)) {
if (extension_loaded('mbstring')) {
-- if (file_exists(__DIR__ . '/vendor/autoload.php')) {
-- require_once __DIR__ . '/vendor/autoload.php';
+- if (file_exists(__DIR__ . '/Idna/vendor/autoload.php')) {
+- require_once __DIR__ . '/Idna/vendor/autoload.php';
- } else {
- require_once __DIR__ . '/../../bundle/vendor/autoload.php';
- }
diff --git a/php-horde-Horde-Idna.spec b/php-horde-Horde-Idna.spec
index 0bffaa1..eb27300 100644
--- a/php-horde-Horde-Idna.spec
+++ b/php-horde-Horde-Idna.spec
@@ -12,7 +12,7 @@
%global pear_channel pear.horde.org
Name: php-horde-Horde-Idna
-Version: 1.0.0
+Version: 1.0.1
Release: 1%{?dist}
Summary: IDNA backend normalization package
@@ -54,7 +54,7 @@ Domain Names in Applications) support.
%setup -q -c
cd %{pear_name}-%{version}
-%patch0 -p0 -b .rpm
+%patch0 -p1 -b .rpm
# don't install bundled library
# don't check checksum of patched file
@@ -106,5 +106,8 @@ fi
%changelog
+* Wed Jan 07 2015 Remi Collet <remi@fedoraproject.org> - 1.0.1-1
+- Update to 1.0.1
+
* Wed Jan 7 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-1
- New Package \ No newline at end of file