up to 3.0.3-1.276.ga7233c3, simplified irc bot install

diff --git a/autoload.patch b/autoload.patch
index 7cab1dfbf3cab4bab05dd11b640c03bb09724eed..303641e03a62ddd84245ce698aa712e6de8a671a 100644 (file)
--- a/autoload.patch
+++ b/autoload.patch
@@ -1,5 +1,5 @@
---- eventum-3.0.3-13-gfefa325/vendor/composer/autoload_classmap.php~   2015-10-13 23:35:34.243698812 +0300
-+++ eventum-3.0.3-13-gfefa325/vendor/composer/autoload_classmap.php    2015-10-13 23:36:06.729885261 +0300
+--- eventum-3.0.3-275-g696281e/vendor/composer/autoload_classmap.php~  2015-10-26 20:37:03.877806879 +0200
++++ eventum-3.0.3-275-g696281e/vendor/composer/autoload_classmap.php   2015-10-26 20:37:31.494068933 +0200
 @@ -4,6 +4,7 @@
  
  $vendorDir = dirname(dirname(__FILE__));
@@ -16,10 +16,10 @@
      'Category' => $baseDir . '/lib/eventum/class.category.php',
      'Command_Line' => $baseDir . '/lib/eventum/class.command_line.php',
      'Contact' => $baseDir . '/lib/eventum/crm/class.contact.php',
-@@ -43,10 +43,7 @@
-     'Email_Account' => $baseDir . '/lib/eventum/class.email_account.php',
+@@ -49,10 +49,7 @@
      'Email_Response' => $baseDir . '/lib/eventum/class.email_response.php',
      'Error_Handler' => $baseDir . '/lib/eventum/class.error_handler.php',
+     'Eventum_Bot' => $baseDir . '/lib/eventum/irc/Eventum_Bot.php',
 -    'Eventum_RPC' => $vendorDir . '/eventum/rpc/class.Eventum_RPC.php',
 -    'Eventum_RPC_Exception' => $vendorDir . '/eventum/rpc/class.Eventum_RPC.php',
      'FAQ' => $baseDir . '/lib/eventum/class.faq.php',

diff --git a/eventum-bot-reconnect.patch b/eventum-bot-reconnect.patch
deleted file mode 100644 (file)
index 49c7e93..0000000
--- a/eventum-bot-reconnect.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- eventum-3.0.0/irc/eventum-irc-bot.php~     2015-02-02 20:07:00.097413069 +0200
-+++ eventum-3.0.0/irc/eventum-irc-bot.php      2015-02-02 20:07:19.803776739 +0200
-@@ -442,7 +442,7 @@
- $irc->setLogdestination(SMARTIRC_FILE);
- $irc->setLogfile(APP_IRC_LOG);
- $irc->setUseSockets(true);
--$irc->setAutoReconnect(true);
-+$irc->setAutoReconnect(false);
- $irc->setAutoRetry(true);
- $irc->setReceiveTimeout(600);
- $irc->setTransmitTimeout(600);

diff --git a/eventum-irc.init b/eventum-irc.init
index e9339d30781e8c1a4422e43853a4f16753f1db02..d0319125cc2700bdc9758657ee0c0f64ed41748c 100755 (executable)
--- a/eventum-irc.init
+++ b/eventum-irc.init
@@ -32,7 +32,7 @@ start() {
 
        msg_starting "Eventum IRC Bot"
        start-stop-daemon --start \
-               --exec /usr/sbin/eventum-irc-bot \
+               --exec /usr/share/eventum/bin/irc-bot.php \
                --pidfile $PIDFILE \
                --chuid http \
                --background

diff --git a/eventum-paths.patch b/eventum-paths.patch
index ca0fc527e3e742365a1dcf45b337ba403956ebd4..a753fcf9006f07fdf035f1ce9d6b0ee325e746b8 100644 (file)
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -41,17 +41,6 @@
      $error = checkPermissions(APP_SETUP_FILE, "File '" . APP_SETUP_FILE. "'");
      if (!empty($error)) {
          $errors[] = $error;
---- eventum-3.0.3-13-gfefa325/irc/eventum-irc-bot.php~ 2015-10-13 20:00:48.000000000 +0300
-+++ eventum-3.0.3-13-gfefa325/irc/eventum-irc-bot.php  2015-10-13 23:33:33.408818382 +0300
-@@ -31,7 +31,7 @@
- 
- ini_set('memory_limit', '1024M');
- 
--require_once __DIR__ . '/../init.php';
-+require_once '/usr/share/eventum/init.php';
- 
- if (!file_exists(APP_CONFIG_PATH . '/irc_config.php')) {
-     fwrite(STDERR, "ERROR: No config specified. Please see setup/irc_config.php for config information.\n\n");
 --- eventum/bin/monitor.php    2010-11-24 17:24:23.000000000 +0200
 +++ eventum/bin/monitor.php    2010-11-24 18:23:09.664934996 +0200
 @@ -37,17 +37,17 @@

diff --git a/eventum.spec b/eventum.spec
index 34560038502c8953a349c780d572f3b86d84df31..e97512aa1605d7d6c03ecbc548911a19df96dd64 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -3,8 +3,8 @@
 %bcond_with    order   # with experimental order patch
 
 %define                rel             1.8
-%define                subver  144
-%define                githash 9fcce7c
+%define                subver  276
+%define                githash a7233c3
 %define                php_min_version 5.3.3
 %include       /usr/lib/rpm/macros.php
 Summary:       Eventum Issue / Bug tracking system
@@ -16,7 +16,7 @@ License:      GPL v2
 Group:         Applications/WWW
 #Source0:      https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Source0:       %{name}-%{version}-%{subver}-g%{githash}.tar.gz
-# Source0-md5: f488e72825c21ddb8adb0d9180848a52
+# Source0-md5: e97361f1429ba03bbd917719b6daec2b
 Source1:       %{name}-apache.conf
 Source2:       %{name}-mail-queue.cron
 Source3:       %{name}-mail-download.cron
@@ -39,7 +39,6 @@ Patch2:               %{name}-order.patch
 # packaging patches that probably never go upstream
 Patch100:      %{name}-paths.patch
 Patch101:      %{name}-cvs-config.patch
-Patch105:      %{name}-bot-reconnect.patch
 Patch107:      %{name}-gettext.patch
 Patch108:      autoload.patch
 # some tests
@@ -495,7 +494,6 @@ rm -f config/config.php
 # packaging
 %patch100 -p1
 %patch101 -p1
-%patch105 -p1
 %patch107 -p1
 %patch108 -p1
 
@@ -533,7 +531,7 @@ install -d \
        $RPM_BUILD_ROOT%{_appdir}/{include,htdocs/misc,upgrade} \
        $RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
-%{__make} install-eventum install-cli install-irc install-scm install-localization \
+%{__make} install-eventum install-cli install-scm install-localization \
        sysconfdir=%{_webappdir} \
        localedir=%{_localedir} \
        DESTDIR=$RPM_BUILD_ROOT
@@ -793,7 +791,7 @@ done
 %defattr(644,root,root,755)
 %attr(640,root,eventum) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/irc_config.php
 %attr(640,root,eventum) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/eventum-irc
-%attr(755,root,root) %{_sbindir}/%{name}-irc-bot
+%attr(755,root,root) %{_appdir}/bin/irc-bot.php
 %attr(754,root,root) /etc/rc.d/init.d/%{name}-irc
 
 %files cli