Kolab Groupware OBS

libphutil.spec Changed

@@ -1,11 +1,15 @@
-%global revision_date 20161210
-%global git_short_version_hash 0ae0cc0
-%global git_full_version_hash 0ae0cc00acb1413c22bfe3384fd6086ade4cc206
+%global revision_date 20171013
+%global git_short_version_hash 7a90825
+%global git_full_version_hash 7a90825f14b2bcb2ffea52191c82e231292619f5
 
 Summary:    A collection of PHP utility classes
 Name:       libphutil
+
+# copr isn't purging older builds, even though they are deleted
+Epoch:      1
+
 Version:    0.%{revision_date}.git%{git_short_version_hash}
-Release:    4%{?dist}
+Release:    2%{?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
@@ -39,14 +43,9 @@
 
 # Virtual provides to silence rpmlint on requiring an explicit
 # library for arcanist and phabricator.
-Provides:   arcanist(libphutil) = %{version}-%{release}
+Provides:   arcanist(libphutil) = %{?epoch:%{epoch}:}%{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
@@ -69,7 +68,7 @@
 
 # Virtual provides to silence rpmlint on requiring an explicit
 # library for arcanist and phabricator.
-Provides:   phabricator(libphutil) = %{version}-%{release}
+Provides:   phabricator(libphutil) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description phabricator
 A meta-package to pull in optimization and server-side dependencies for
@@ -121,6 +120,30 @@
 %doc README.phabricator
 
 %changelog
+* Mon Oct 16 2017 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1:0.20171013.git7a90825-2
+- Rebuild
+
+* Mon Oct 16 2017 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1:0.20171013.git7a90825-1
+- Promote Week #41 2017
+
+* Sun May 28 2017 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1:0.20170429.gitd02cc05-2
+- Rebuild
+
+* Tue Mar 14 2017 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20170305.git796cb1c-1
+- Promote Week #09 2017
+
+* Thu Feb 23 2017 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20170218.gitd0ebdaf-1
+- Promote Week #07 2017
+
+* Thu Feb 09 2017 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20170113.git10963f7-3
+- Rebuild
+
+* Sun Jan 22 2017 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20170113.git10963f7-2
+- Rebuild
+
+* Wed Jan 18 2017 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20170113.git10963f7-1
+- Promote Week #02 2017
+
 * Fri Dec 30 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20161210.git0ae0cc0-4
 - Rebuild

0001-Unvendorize-jsonlint.patch Changed

0002-Remove-xhprof-dependency.patch Changed

@@ -1,4 +1,4 @@
-From 09de3644f8e0e8f62b218d99ee210aa863c684ad Mon Sep 17 00:00:00 2001
+From d5b3e97359f034d5aef2a8f73f4edf8efe653c70 Mon Sep 17 00:00:00 2001
 From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
 Date: Tue, 9 Aug 2016 19:31:50 +0200
 Subject: [PATCH 2/5] Remove xhprof dependency
@@ -76,10 +76,10 @@
        "ext.name": "dom",
        "ext.min": "5.0.0",
 diff --git a/src/parser/argument/PhutilArgumentParser.php b/src/parser/argument/PhutilArgumentParser.php
-index f554d65..f26503b 100644
+index 177e800..a7eb4e1 100644
 --- a/src/parser/argument/PhutilArgumentParser.php
 +++ b/src/parser/argument/PhutilArgumentParser.php
-@@ -448,12 +448,9 @@ final class PhutilArgumentParser extends Phobject {
+@@ -451,12 +451,9 @@ final class PhutilArgumentParser extends Phobject {
     *
     *    --trace             Enable service call tracing.
     *    --no-ansi           Disable ANSI color/style sequences.
@@ -92,7 +92,7 @@
     */
    public function parseStandardArguments() {
      try {
-@@ -528,17 +525,6 @@ final class PhutilArgumentParser extends Phobject {
+@@ -531,17 +528,6 @@ final class PhutilArgumentParser extends Phobject {
        $this->showHelp = true;
      }
  
@@ -110,7 +110,7 @@
      $recon = $this->getArg('recon');
      if ($recon) {
        $remote_console = PhutilConsole::newRemoteConsole();
-@@ -854,15 +840,6 @@ final class PhutilArgumentParser extends Phobject {
+@@ -857,15 +843,6 @@ final class PhutilArgumentParser extends Phobject {
      return phutil_console_wrap($text, $level);
    }
  
@@ -127,5 +127,5 @@
      return self::$traceModeEnabled;
    }
 -- 
-2.9.3
+2.14.1

0003-Unvendorize-porter-stemmer.patch Changed

@@ -1,18 +1,18 @@
-From e80db738119dafd291c18358856575cce8d368a6 Mon Sep 17 00:00:00 2001
+From a4719b0a35679bf2e12f961acca5abdc344b84db 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(-)
+ src/search/PhutilSearchStemmer.php | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
 
 diff --git a/src/search/PhutilSearchStemmer.php b/src/search/PhutilSearchStemmer.php
-index 84ba634..31e5d8a 100644
+index c4a8604..521709c 100644
 --- a/src/search/PhutilSearchStemmer.php
 +++ b/src/search/PhutilSearchStemmer.php
-@@ -34,18 +34,17 @@ final class PhutilSearchStemmer
+@@ -40,7 +40,7 @@ final class PhutilSearchStemmer
    }
  
    /**
@@ -20,6 +20,8 @@
 +   * @phutil-external-symbol class CamSpiers\Porter
     */
    private function applyStemmer($normalized_token) {
+     // If the token has internal punctuation, handle it literally. This
+@@ -53,13 +53,11 @@ final class PhutilSearchStemmer
      static $loaded;
  
      if ($loaded === null) {
@@ -29,11 +31,12 @@
        $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
+2.14.1

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

@@ -1,4 +1,4 @@
-From 2c5bdad9c5c4f027597471474e82c6f1bdf349a3 Mon Sep 17 00:00:00 2001
+From 8959a769f520d282449e2c6ac7d15250a2c8fea5 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
@@ -8,25 +8,25 @@
  1 file changed, 2 deletions(-)
 
 diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
-index 153d3d6..8cd652c 100644
+index 2fb390a..6e95f22 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',
+@@ -33,7 +33,6 @@ phutil_register_library_map(array(
+     'AphrontMultipartParser' => 'aphront/multipartparser/AphrontMultipartParser.php',
+     'AphrontMultipartParserTestCase' => 'aphront/multipartparser/__tests__/AphrontMultipartParserTestCase.php',
+     'AphrontMultipartPart' => 'aphront/multipartparser/AphrontMultipartPart.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',
+@@ -646,7 +645,6 @@ phutil_register_library_map(array(
+     'AphrontMultipartParser' => 'Phobject',
+     'AphrontMultipartParserTestCase' => 'PhutilTestCase',
+     'AphrontMultipartPart' => 'Phobject',
 -    'AphrontMySQLDatabaseConnection' => 'AphrontBaseMySQLDatabaseConnection',
      'AphrontMySQLiDatabaseConnection' => 'AphrontBaseMySQLDatabaseConnection',
      'AphrontNotSupportedQueryException' => 'AphrontQueryException',
      'AphrontObjectMissingQueryException' => 'AphrontQueryException',
 -- 
-2.9.3
+2.14.1

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

libphutil-0ae0cc00acb1413c22bfe3384fd6086ade4cc206.tar.gz Deleted

libphutil-7a90825f14b2bcb2ffea52191c82e231292619f5.tar.gz Added

update.sh Changed

@@ -67,23 +67,10 @@
     -e "s/git_short_version_hash .*$/git_short_version_hash ${git_short_version_hash}/g" \
     -e "s/git_full_version_hash .*$/git_full_version_hash ${git_full_version_hash}/g" \
     -e "s/revision_date [0-9]+$/revision_date ${commitdate}/g" \
+    -e "s/ver_months_ahead (.*)0\.[0-9]+$/ver_months_ahead \10.${months_ahead}/g" \
+    -e "s/ver_months_behind (.*)0\.[0-9]+$/ver_months_behind \10.${months_behind}/g" \
     ${package}.spec
 
-if [ "${package}" == "arcanist" ]; then
-    sed -i -r \
-        -e "s/Requires:(\s+)arcanist$libphutil$ >= 0\.[0-9]+/Requires:\1arcanist$libphutil$ >= 0\.${months_behind}/g" \
-        -e "s/Requires:(\s+)arcanist$libphutil$ <= 0\.[0-9]+/Requires:\1arcanist$libphutil$ <= 0\.${months_ahead}/g" \
-        ${package}.spec
-
-elif [ "${package}" == "phabricator" ]; then
-    sed -i -r \
-        -e "s/Requires:(\s+)arcanist >= 0\.[0-9]+/Requires:\1arcanist >= 0\.${months_behind}/g" \
-        -e "s/Requires:(\s+)arcanist <= 0\.[0-9]+/Requires:\1arcanist <= 0\.${months_ahead}/g" \
-        -e "s/Requires:(\s+)phabricator$libphutil$ >= 0\.[0-9]+/Requires:\1phabricator$libphutil$ >= 0\.${months_behind}/g" \
-        -e "s/Requires:(\s+)phabricator$libphutil$ <= 0\.[0-9]+/Requires:\1phabricator$libphutil$ <= 0\.${months_ahead}/g" \
-        ${package}.spec
-fi
-
 if [ "${git_full_version_hash}" != "${current_version}" ]; then
     rpmdev-bumpspec \
         --new="0.${commitdate}.git${git_short_version_hash}" \

Changes of Revision 27