[packages/eventum-scm: 2/5] up to a44a17d, config no longer used
glen
glen at pld-linux.org
Thu Apr 28 19:34:17 CEST 2016
commit 952766246119d9c90ec18eb590aa897a79a156d3
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Apr 23 00:09:10 2016 +0300
up to a44a17d, config no longer used
config.patch | 39 ---------------------------------------
config.php | 5 -----
eventum-scm.spec | 14 ++++----------
3 files changed, 4 insertions(+), 54 deletions(-)
---
diff --git a/eventum-scm.spec b/eventum-scm.spec
index 98f7970..9e45127 100644
--- a/eventum-scm.spec
+++ b/eventum-scm.spec
@@ -4,14 +4,12 @@ Summary: Eventum SCM integration
Summary(pl.UTF-8): Integracja SCM dla Eventum
Name: eventum-scm
Version: 3.1.0
-Release: 0.2
+Release: 0.4
License: GPL v2+
Group: Networking/Utilities
#Source0: https://github.com/eventum/scm/archive/v%{version}/%{name}-%{version}.tar.gz
-Source0: https://github.com/eventum/scm/archive/master/%{name}-%{version}.tar.gz
-# Source0-md5: e772d15161474c1ec1c57c61d07d1f4c
-Source1: config.php
-Patch0: config.patch
+Source0: https://github.com/eventum/scm/archive/a44a17d/%{name}-%{version}.tar.gz
+# Source0-md5: 4e93c08549ee6b3749127fe0bdbea40a
URL: https://github.com/eventum/scm
BuildRequires: /usr/bin/php
BuildRequires: php(core) >= %{php_min_version}
@@ -55,12 +53,10 @@ Szczegóły na temat instalacji można przeczytać pod
%prep
%setup -qc
mv scm-*/* .
-%patch0 -p2
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}}
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/scm.php
+install -d $RPM_BUILD_ROOT%{_sbindir}
cp -p helpers.php $RPM_BUILD_ROOT%{_sbindir}
for a in eventum-*-hook.php; do
f=${a%.php}
@@ -72,8 +68,6 @@ rm -rf $RPM_BUILD_ROOT
%files
%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
diff --git a/config.patch b/config.patch
deleted file mode 100644
index f8623a8..0000000
--- a/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/config.php b/config.php
deleted file mode 100644
index eb86299..0000000
--- a/config.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/';
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/eventum-scm.git/commitdiff/c9bfd5280e8ed5924ece0d3a27dffd0adb81661a
More information about the pld-cvs-commit
mailing list