Kolab Groupware OBS

libphutil.spec Changed

@@ -4,42 +4,60 @@
 Summary:    A collection of PHP utility classes
 Name:       libphutil
 Version:    20160727.git%{git_short_version_hash}
-Release:    1%{?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
 
+# Document what's in the phabricator subpackage, so that RPM will
+# be able to build the actual subpackage.
+Source999:  README.phabricator
+
 Patch0001:  0001-Parse-From-lines-in-the-format-user-domain.com-user-.patch
 Patch0002:  0002-Unvendorize-jsonlint.patch
+Patch0003:  0003-Remove-xhprof-dependency.patch
 
 BuildArch:  noarch
 
 # Virtual provides to silence rpmlint on requiring an explicit
 # library for arcanist and phabricator.
-Provides:   phabricator(libphutil) = %{version}-%{release}
+Provides:   arcanist(libphutil) = %{version}-%{release}
 
 Requires:   php(language) >= 5
 Requires:   php-curl
 Requires:   php-date
 Requires:   php-fileinfo
-Requires:   php-gd
 Requires:   php-jsonlint
-Requires:   php-ldap
 Requires:   php-mbstring
-Requires:   php-mysqli
-Requires:   php-pecl-apcu
-Requires:   php-pecl-xhprof
-Requires:   php-pecl-zendopcache
 Requires:   php-xml
 
 %description
 A collection of PHP utility classes used with phabricator
 
+%package phabricator
+Summary:    A collection of dependencies optimized for Phabricator
+Requires:   php-gd
+Requires:   php-ldap
+Requires:   php-mysqlnd
+Requires:   php-opcache
+Requires:   php-pecl(APC)
+
+# Virtual provides to silence rpmlint on requiring an explicit
+# library for arcanist and phabricator.
+Provides:   phabricator(libphutil) = %{version}-%{release}
+
+%description phabricator
+A meta-package to pull in optimization and server-side dependencies for
+Phabricator.
+
 %prep
 %setup -q -n libphutil-%{git_full_version_hash}
 
 %patch0001 -p1 -b .email-format
 %patch0002 -p1 -b .unven-jsonlint
+%patch0003 -p1 -b .remove-xhprof
+
+cp -a %{SOURCE999} .
 
 %build
 
@@ -64,8 +82,14 @@
 %{_datadir}/%{name}/scripts
 %{_datadir}/%{name}/src
 
+%files phabricator
+%doc README.phabricator
+
 %changelog
-* Tue Aug  9 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 20160727.git8f8e02d-1
+* Tue Aug  9 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 20160727.git8f8e02d-2
+- Adjust dependency on php-opcache
+- Adjust dependency on php-pecl-apcu
+- Remove dependency on XHProf (strip references to it as well)
 - Taking in some of the packaging review recommendations
 
 * Wed Feb 25 2015 Tim Flink <tflink@fedoraproject.org> - 20150211.git9e0ea2c-2

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

0002-Unvendorize-jsonlint.patch Changed

0003-Remove-xhprof-dependency.patch Added

@@ -0,0 +1,131 @@
+From 4ec8f50d5c46c53df8b0cc0b81895a1d39746f05 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 3/3] Remove xhprof dependency
+
+---
+ resources/php_compat_info.json               | 49 ----------------------------
+ src/parser/argument/PhutilArgumentParser.php | 23 -------------
+ 2 files changed, 72 deletions(-)
+
+diff --git a/resources/php_compat_info.json b/resources/php_compat_info.json
+index e9c3145..1731719 100644
+--- a/resources/php_compat_info.json
++++ b/resources/php_compat_info.json
+@@ -19493,34 +19493,6 @@
+       "php.min": "4.3.0",
+       "php.max": null
+     },
+-    "xhprof_disable": {
+-      "ext.name": "xhprof",
+-      "ext.min": "0.9.0",
+-      "ext.max": null,
+-      "php.min": "5.2.0",
+-      "php.max": null
+-    },
+-    "xhprof_enable": {
+-      "ext.name": "xhprof",
+-      "ext.min": "0.9.0",
+-      "ext.max": null,
+-      "php.min": "5.2.0",
+-      "php.max": null
+-    },
+-    "xhprof_sample_disable": {
+-      "ext.name": "xhprof",
+-      "ext.min": "0.9.0",
+-      "ext.max": null,
+-      "php.min": "5.2.0",
+-      "php.max": null
+-    },
+-    "xhprof_sample_enable": {
+-      "ext.name": "xhprof",
+-      "ext.min": "0.9.0",
+-      "ext.max": null,
+-      "php.min": "5.2.0",
+-      "php.max": null
+-    },
+     "xml_error_string": {
+       "ext.name": "xml",
+       "ext.min": "4.0.0",
+@@ -45182,27 +45154,6 @@
+       "php.min": "5.4.0",
+       "php.max": null
+     },
+-    "XHPROF_FLAGS_CPU": {
+-      "ext.name": "xhprof",
+-      "ext.min": "0.9.0",
+-      "ext.max": null,
+-      "php.min": "5.2.0",
+-      "php.max": null
+-    },
+-    "XHPROF_FLAGS_MEMORY": {
+-      "ext.name": "xhprof",
+-      "ext.min": "0.9.0",
+-      "ext.max": null,
+-      "php.min": "5.2.0",
+-      "php.max": null
+-    },
+-    "XHPROF_FLAGS_NO_BUILTINS": {
+-      "ext.name": "xhprof",
+-      "ext.min": "0.9.0",
+-      "ext.max": null,
+-      "php.min": "5.2.0",
+-      "php.max": null
+-    },
+     "XML_ATTRIBUTE_CDATA": {
+       "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
+--- a/src/parser/argument/PhutilArgumentParser.php
++++ b/src/parser/argument/PhutilArgumentParser.php
+@@ -448,12 +448,9 @@ final class PhutilArgumentParser extends Phobject {
+    *
+    *    --trace             Enable service call tracing.
+    *    --no-ansi           Disable ANSI color/style sequences.
+-   *    --xprofile <file>   Write out an XHProf profile.
+    *    --help              Show help.
+    *
+    * @return this
+-   *
+-   * @phutil-external-symbol function xhprof_enable
+    */
+   public function parseStandardArguments() {
+     try {
+@@ -528,17 +525,6 @@ final class PhutilArgumentParser extends Phobject {
+       $this->showHelp = true;
+     }
+ 
+-    $xprofile = $this->getArg('xprofile');
+-    if ($xprofile) {
+-      if (!function_exists('xhprof_enable')) {
+-        throw new Exception(
+-          pht("To use '%s', you must install XHProf.", '--xprofile'));
+-      }
+-
+-      xhprof_enable(0);
+-      register_shutdown_function(array($this, 'shutdownProfiler'));
+-    }
+-
+     $recon = $this->getArg('recon');
+     if ($recon) {
+       $remote_console = PhutilConsole::newRemoteConsole();
+@@ -854,15 +840,6 @@ final class PhutilArgumentParser extends Phobject {
+     return phutil_console_wrap($text, $level);
+   }
+ 
+-  /**
+-   * @phutil-external-symbol function xhprof_disable
+-   */
+-  public function shutdownProfiler() {
+-    $data = xhprof_disable();
+-    $data = json_encode($data);
+-    Filesystem::writeFile($this->getArg('xprofile'), $data);
+-  }
+-
+   public static function isTraceModeEnabled() {
+     return self::$traceModeEnabled;
+   }
+-- 
+2.5.5
+

README.phabricator Added

Changes of Revision 8