scm subpackage dropped; distributed separately

diff --git a/eventum-cvs-config.patch b/eventum-cvs-config.patch
deleted file mode 100644 (file)
index f8623a8..0000000
--- a/eventum-cvs-config.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- eventum-3.0.0-pre1/scm/eventum-cvs-hook.php~       2014-11-30 13:48:18.000000000 +0200
-+++ eventum-3.0.0-pre1/scm/eventum-cvs-hook.php        2015-02-09 14:39:22.881991719 +0200
-@@ -52,9 +52,7 @@
- // SCM repository name. Needed if multiple repositories configured
- $scm_name = 'cvs';
- 
--//
--// DO NOT CHANGE ANYTHING AFTER THIS LINE
--//
-+require '/etc/eventum/scm.php';
- 
- // save name of this script
- $PROGRAM = basename(realpath(array_shift($argv)), '.php');
---- eventum-3.0.0-pre1/scm/eventum-svn-hook.php~       2014-11-30 13:48:18.000000000 +0200
-+++ eventum-3.0.0-pre1/scm/eventum-svn-hook.php        2015-02-09 14:40:05.184671966 +0200
-@@ -48,9 +48,7 @@
- // SCM repository name. Needed if multiple repositories configured
- $scm_name = 'svn';
- 
--//
--// DO NOT CHANGE ANYTHING AFTER THIS LINE
--//
-+require '/etc/eventum/scm.php';
- 
- // save name of this script
- $PROGRAM = basename(realpath(array_shift($argv)), '.php');
---- eventum-3.0.0-pre1/scm/eventum-git-hook.php~       2014-11-30 13:48:18.000000000 +0200
-+++ eventum-3.0.0-pre1/scm/eventum-git-hook.php        2015-04-08 16:37:51.434314140 +0300
-@@ -34,9 +34,7 @@
- // TODO: use $GL_REPO
- $scm_name = 'git';
- 
--//
--// DO NOT CHANGE ANYTHING AFTER THIS LINE
--//
-+require '/etc/eventum/scm.php';
- 
- // save name of this script
- $PROGRAM = basename(realpath(array_shift($argv)), '.php');

diff --git a/eventum-cvs.php b/eventum-cvs.php
deleted file mode 100644 (file)
index eb86299..0000000
--- a/eventum-cvs.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-# URL to your Eventum installation.
-# https is supported transparently by PHP 5 if you have openssl module enabled.
-
-$eventum_url = 'http://localhost/eventum/';

diff --git a/eventum.spec b/eventum.spec
index 647aa83fc081455605645672219a2ecd4a76d2e6..994fcc43e367296369cc7e44b84f2196bf4ac08c 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -22,7 +22,6 @@ Source2:      %{name}-mail-queue.cron
 Source3:       %{name}-mail-download.cron
 Source4:       %{name}-reminder.cron
 Source5:       %{name}-monitor.cron
-Source6:       %{name}-cvs.php
 Source8:       %{name}-irc.init
 Source9:       %{name}-irc.sysconfig
 Source10:      sphinx.crontab
@@ -37,7 +36,6 @@ Patch2:               %{name}-order.patch
 #Patch4:               https://github.com/glensc/eventum/compare/cf_escape.patch
 # packaging patches that probably never go upstream
 Patch100:      %{name}-paths.patch
-Patch101:      %{name}-cvs-config.patch
 Patch107:      %{name}-gettext.patch
 Patch108:      autoload.patch
 # some tests
@@ -344,40 +342,6 @@ features of the web interface straight from your command shell.
 Interfejs linii poleceń Eventum pozwala na dostęp do większości
 funkcji interfejsu WWW prosto z linii poleceń powłoki.
 
-%package scm
-Summary:       Eventum SCM integration
-Summary(pl.UTF-8):     Integracja SCM dla Eventum
-Group:         Applications/WWW
-Requires:      php(core) >= %{php_min_version}
-Requires:      php(json)
-Requires:      php(pcre)
-Requires:      php(spl)
-Suggests:      cvs
-Suggests:      git-core
-Suggests:      php(openssl)
-Suggests:      subversion
-
-%description scm
-This feature allows your software development teams to integrate your
-Source Control Management system with your Issue Tracking System.
-
-The integration is implemented in such a way that it will be forward
-compatible with pretty much any SCM system, such as CVS.
-
-For installation see
-</eventum/help.php?topic=scm_integration_installation>.
-
-%description scm -l pl.UTF-8
-Ten pakiet pozwala zespołom programistów na integrację systemu
-zarządzania źródłami (SCM - Source Control Management) z systemem
-śledzenia spraw.
-
-Integracja jest zaimplementowana tak, aby być kompatybilna w przód z
-prawie każdym systemem SCM, jak np. CVS.
-
-Szczegóły na temat instalacji można przeczytać pod
-</eventum/help.php?topic=scm_integration_installation>.
-
 %package sphinx
 Summary:       Eventum Sphinx Search
 Group:         Applications/WWW
@@ -423,7 +387,6 @@ rm config/config.php
 
 # packaging
 %patch100 -p1
-%patch101 -p1
 %patch107 -p1
 %patch108 -p1
 
@@ -469,7 +432,7 @@ install -d \
        $RPM_BUILD_ROOT/var/lib/%{name}/routed_{emails,drafts,notes} \
        $RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
-%{__make} install-eventum install-cli install-scm install-localization \
+%{__make} install-eventum install-cli install-localization \
        sysconfdir=%{_webappdir} \
        localedir=%{_localedir} \
        DESTDIR=$RPM_BUILD_ROOT
@@ -515,9 +478,6 @@ cp -p %{SOURCE17} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
 %find_lang %{name}
 
-# scm
-cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/scm.php
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -724,15 +684,6 @@ done
 %doc cli/eventumrc
 %attr(755,root,root) %{_bindir}/%{name}
 
-%files scm
-%defattr(644,root,root,755)
-%attr(751,root,root) %dir %{_sysconfdir}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/scm.php
-%attr(755,root,root) %{_sbindir}/eventum-cvs-hook
-%attr(755,root,root) %{_sbindir}/eventum-git-hook
-%attr(755,root,root) %{_sbindir}/eventum-svn-hook
-%attr(755,root,root) %{_sbindir}/helpers.php
-
 %files sphinx
 %defattr(644,root,root,755)
 %{_webappdir}/sphinx.conf.php