Kolab Groupware OBS

libphutil.spec Changed

@@ -1,11 +1,11 @@
-%global revision_date 20161126
-%global git_short_version_hash 89984ac
-%global git_full_version_hash 89984ac200598c028e95d2518ae621da41c09042
+%global revision_date 20161210
+%global git_short_version_hash 0ae0cc0
+%global git_full_version_hash 0ae0cc00acb1413c22bfe3384fd6086ade4cc206
 
 Summary:    A collection of PHP utility classes
 Name:       libphutil
 Version:    0.%{revision_date}.git%{git_short_version_hash}
-Release:    4%{?dist}
+Release:    1%{?dist}
 License:    ASL 2.0
 URL:        http://www.phabricator.com/docs/libphutil/
 Source0:    https://github.com/phacility/libphutil/archive/%{git_full_version_hash}.tar.gz#/libphutil-%{git_full_version_hash}.tar.gz
@@ -23,15 +23,17 @@
 # https://github.com/kanarip/libphutil/tree/packaging/stable/0002-remove-deprecated-xhprof-dependency
 # No longer needed in the next promotion of master to stable
 Patch0002:  0002-Remove-xhprof-dependency.patch
-# https://github.com/kanarip/libphutil/tree/packaging/stable/0003-remove-mysql-dependency
-Patch0003:  0003-Strip-dependency-on-deprecated-MySQL-PHP-extension.patch
+# https://github.com/kanarip/libphutil/tree/packaging/stable/0003-unvendorize-porter-stemmer
+Patch0003:  0003-Unvendorize-porter-stemmer.patch
+# https://github.com/kanarip/libphutil/tree/packaging/stable/0004-Strip-deprecated-MySQL
+Patch0004:  0004-Strip-dependency-on-deprecated-MySQL-PHP-extension.patch
 
 ##
 ## Feature enhancements (arguably)
 ##
 
 # https://github.com/kanarip/libphutil/tree/feature/stable/0001-fix-from-address-parsing
-Patch0004:  0004-Parse-From-lines-in-the-format-user-domain.com-user-.patch
+Patch0005:  0005-Parse-From-lines-in-the-format-user-domain.com-user-.patch
 
 BuildArch:  noarch
 
@@ -40,6 +42,11 @@
 Provides:   arcanist(libphutil) = %{version}-%{release}
 
 Requires:   php(language) >= 5
+# See:
+# * https://pagure.io/phabphourphedora/issue/7
+# * https://secure.phabricator.com/T9640#184099
+# * https://secure.phabricator.com/T11270
+Requires:   php(language) < 7
 Requires:   php-curl
 Requires:   php-date
 Requires:   php-fileinfo
@@ -53,6 +60,7 @@
 
 %package phabricator
 Summary:    A collection of dependencies optimized for Phabricator
+Requires:   php-composer(camspiers/porter-stemmer) >= 1.0.0
 Requires:   php-gd
 Requires:   php-ldap
 Requires:   php-mysqli
@@ -76,11 +84,12 @@
 
 %patch0002 -p1
 %patch0003 -p1
+%patch0004 -p1
 
 # Also remove the files associated with it, keeps things clean for review
 find src/ -type f -name "*MySQL*" -a ! -name "*BaseMySQL*" -a ! -name "*MySQLi*" -delete
 
-%patch0004 -p1
+%patch0005 -p1
 
 cp -a %{SOURCE999} .
 
@@ -112,6 +121,24 @@
 %doc README.phabricator
 
 %changelog
+* Mon Dec 12 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20161210.git0ae0cc0-1
+- Promote Week #49 2016
+
+* Sun Dec 04 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20161203.git3230179-3
+- Rebuild
+
+* Sun Dec 04 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20161203.git3230179-2
+- Rebuild
+
+* Sat Dec 03 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20161203.git3230179-1
+- Promote Week #48 2016
+
+* Sat Dec 03 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20161126.git89984ac-6
+- Rebuild
+
+* Thu Dec 01 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20161126.git89984ac-5
+- Rebuild
+
 * Thu Dec 01 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20161126.git89984ac-4
 - Rebuild

0001-Unvendorize-jsonlint.patch Changed

0002-Remove-xhprof-dependency.patch Changed

0003-Strip-dependency-on-deprecated-MySQL-PHP-extension.patch Deleted

@@ -1,32 +0,0 @@
-From 6c8dc83996225546dbdee22a0e1a704959b22dfd Mon Sep 17 00:00:00 2001
-From: Tim Flink <tflink@fedoraproject.org>
-Date: Thu, 1 Dec 2016 10:28:17 +0100
-Subject: [PATCH 3/4] Strip dependency on deprecated MySQL PHP extension
-
----
- src/__phutil_library_map__.php | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
-index 4348778..8470b51 100644
---- a/src/__phutil_library_map__.php
-+++ b/src/__phutil_library_map__.php
-@@ -28,7 +28,6 @@ phutil_register_library_map(array(
-     'AphrontInvalidCredentialsQueryException' => 'aphront/storage/exception/AphrontInvalidCredentialsQueryException.php',
-     'AphrontIsolatedDatabaseConnection' => 'aphront/storage/connection/AphrontIsolatedDatabaseConnection.php',
-     'AphrontLockTimeoutQueryException' => 'aphront/storage/exception/AphrontLockTimeoutQueryException.php',
--    'AphrontMySQLDatabaseConnection' => 'aphront/storage/connection/mysql/AphrontMySQLDatabaseConnection.php',
-     'AphrontMySQLiDatabaseConnection' => 'aphront/storage/connection/mysql/AphrontMySQLiDatabaseConnection.php',
-     'AphrontNotSupportedQueryException' => 'aphront/storage/exception/AphrontNotSupportedQueryException.php',
-     'AphrontObjectMissingQueryException' => 'aphront/storage/exception/AphrontObjectMissingQueryException.php',
-@@ -612,7 +611,6 @@ phutil_register_library_map(array(
-     'AphrontInvalidCredentialsQueryException' => 'AphrontQueryException',
-     'AphrontIsolatedDatabaseConnection' => 'AphrontDatabaseConnection',
-     'AphrontLockTimeoutQueryException' => 'AphrontRecoverableQueryException',
--    'AphrontMySQLDatabaseConnection' => 'AphrontBaseMySQLDatabaseConnection',
-     'AphrontMySQLiDatabaseConnection' => 'AphrontBaseMySQLDatabaseConnection',
-     'AphrontNotSupportedQueryException' => 'AphrontQueryException',
-     'AphrontObjectMissingQueryException' => 'AphrontQueryException',
--- 
-2.9.3
-

0003-Unvendorize-porter-stemmer.patch Added

@@ -0,0 +1,39 @@
+From 08c4fc95795242ba3290418014fb36d89ac67229 Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
+Date: Sun, 4 Dec 2016 11:32:09 +0100
+Subject: [PATCH 3/5] Unvendorize porter-stemmer
+
+Correctly load CamSpiers\PorterStemmer\Porter
+---
+ src/search/PhutilSearchStemmer.php | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/search/PhutilSearchStemmer.php b/src/search/PhutilSearchStemmer.php
+index 84ba634..31e5d8a 100644
+--- a/src/search/PhutilSearchStemmer.php
++++ b/src/search/PhutilSearchStemmer.php
+@@ -34,18 +34,17 @@ final class PhutilSearchStemmer
+   }
+ 
+   /**
+-   * @phutil-external-symbol class Porter
++   * @phutil-external-symbol class CamSpiers\Porter
+    */
+   private function applyStemmer($normalized_token) {
+     static $loaded;
+ 
+     if ($loaded === null) {
+-      $root = dirname(phutil_get_library_root('phutil'));
+-      require_once $root.'/externals/porter-stemmer/src/Porter.php';
++      require_once 'CamSpiers/PorterStemmer/Porter.php';
+       $loaded = true;
+     }
+ 
+-    $stem = Porter::stem($normalized_token);
++    $stem = CamSpiers\PorterStemmer\Porter::stem($normalized_token);
+ 
+     // If the stem is too short, it won't be a candidate for indexing. These
+     // tokens are also likely to be acronyms (like "DNS") rather than real
+-- 
+2.9.3
+

0004-Parse-From-lines-in-the-format-user-domain.com-user-.patch Deleted

@@ -1,28 +0,0 @@
-From 5cdf352e3d1957a0a6b871e1df6fa071caa49973 Mon Sep 17 00:00:00 2001
-From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
-Date: Fri, 29 Jul 2016 12:36:11 +0200
-Subject: [PATCH 4/4] Parse From: lines in the format "user@domain.com (user)"
- correctly.
-
----
- src/parser/PhutilEmailAddress.php | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/parser/PhutilEmailAddress.php b/src/parser/PhutilEmailAddress.php
-index b9a3a44..be811de 100644
---- a/src/parser/PhutilEmailAddress.php
-+++ b/src/parser/PhutilEmailAddress.php
-@@ -24,6 +24,10 @@ final class PhutilEmailAddress extends Phobject {
-         $local_part = $matches[2];
-         $domain_name = null;
-       }
-+    } else if (preg_match('/^(.*)@(.*)\s$(.*)$$/', $email_address, $matches)) {
-+      $display_name = $matches[3];
-+      $local_part = $matches[1];
-+      $domain_name = $matches[2];
-     } else if (preg_match('/^(.*)@(.*)$/', $email_address, $matches)) {
-       $display_name = null;
-       $local_part = $matches[1];
--- 
-2.9.3
-

0004-Strip-dependency-on-deprecated-MySQL-PHP-extension.patch Added

@@ -0,0 +1,32 @@
+From 9b37f3a5e7ce655d9aa9b5e997421480cf5d2d3e Mon Sep 17 00:00:00 2001
+From: Tim Flink <tflink@fedoraproject.org>
+Date: Thu, 1 Dec 2016 10:28:17 +0100
+Subject: [PATCH 4/5] Strip dependency on deprecated MySQL PHP extension
+
+---
+ src/__phutil_library_map__.php | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
+index 153d3d6..8cd652c 100644
+--- a/src/__phutil_library_map__.php
++++ b/src/__phutil_library_map__.php
+@@ -28,7 +28,6 @@ phutil_register_library_map(array(
+     'AphrontInvalidCredentialsQueryException' => 'aphront/storage/exception/AphrontInvalidCredentialsQueryException.php',
+     'AphrontIsolatedDatabaseConnection' => 'aphront/storage/connection/AphrontIsolatedDatabaseConnection.php',
+     'AphrontLockTimeoutQueryException' => 'aphront/storage/exception/AphrontLockTimeoutQueryException.php',
+-    'AphrontMySQLDatabaseConnection' => 'aphront/storage/connection/mysql/AphrontMySQLDatabaseConnection.php',
+     'AphrontMySQLiDatabaseConnection' => 'aphront/storage/connection/mysql/AphrontMySQLiDatabaseConnection.php',
+     'AphrontNotSupportedQueryException' => 'aphront/storage/exception/AphrontNotSupportedQueryException.php',
+     'AphrontObjectMissingQueryException' => 'aphront/storage/exception/AphrontObjectMissingQueryException.php',
+@@ -614,7 +613,6 @@ phutil_register_library_map(array(
+     'AphrontInvalidCredentialsQueryException' => 'AphrontQueryException',
+     'AphrontIsolatedDatabaseConnection' => 'AphrontDatabaseConnection',
+     'AphrontLockTimeoutQueryException' => 'AphrontRecoverableQueryException',
+-    'AphrontMySQLDatabaseConnection' => 'AphrontBaseMySQLDatabaseConnection',
+     'AphrontMySQLiDatabaseConnection' => 'AphrontBaseMySQLDatabaseConnection',
+     'AphrontNotSupportedQueryException' => 'AphrontQueryException',
+     'AphrontObjectMissingQueryException' => 'AphrontQueryException',
+-- 
+2.9.3
+

0005-Parse-From-lines-in-the-format-user-domain.com-user-.patch Added

@@ -0,0 +1,28 @@
+From 1e7dfd36c2f6e8e184408ab00cd3f668840f1041 Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
+Date: Fri, 29 Jul 2016 12:36:11 +0200
+Subject: [PATCH 5/5] Parse From: lines in the format "user@domain.com (user)"
+ correctly.
+
+---
+ src/parser/PhutilEmailAddress.php | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/parser/PhutilEmailAddress.php b/src/parser/PhutilEmailAddress.php
+index b9a3a44..be811de 100644
+--- a/src/parser/PhutilEmailAddress.php
++++ b/src/parser/PhutilEmailAddress.php
+@@ -24,6 +24,10 @@ final class PhutilEmailAddress extends Phobject {
+         $local_part = $matches[2];
+         $domain_name = null;
+       }
++    } else if (preg_match('/^(.*)@(.*)\s$(.*)$$/', $email_address, $matches)) {
++      $display_name = $matches[3];
++      $local_part = $matches[1];
++      $domain_name = $matches[2];
+     } else if (preg_match('/^(.*)@(.*)$/', $email_address, $matches)) {
+       $display_name = null;
+       $local_part = $matches[1];
+-- 
+2.9.3
+

libphutil-0ae0cc00acb1413c22bfe3384fd6086ade4cc206.tar.gz Added

libphutil-89984ac200598c028e95d2518ae621da41c09042.tar.gz Deleted

Changes of Revision 24