[RackTables/f18] Rebase to v0.20.3

Colin Coe coec at fedoraproject.org
Tue Jan 1 05:56:44 UTC 2013


commit d5e04cd109f2fd5bec678ee0588d2a471ca78c56
Author: Colin Coe <colin.coe at gmail.com>
Date:   Tue Jan 1 13:56:39 2013 +0800

    Rebase to v0.20.3

 .gitignore                    |    1 +
 RackTables-Fedora-paths.patch |   25 ++++++++-----------------
 RackTables.spec               |   10 ++++++++--
 sources                       |    2 +-
 4 files changed, 18 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 57b56d4..c2daf86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ RackTables-0.18.3.tar.gz
 /RackTables-0.19.9.tar.gz
 /RackTables-0.19.11.tar.gz
 /RackTables-0.19.12.tar.gz
+/RackTables-0.20.3.tar.gz
diff --git a/RackTables-Fedora-paths.patch b/RackTables-Fedora-paths.patch
index ab3a68e..70c8073 100644
--- a/RackTables-Fedora-paths.patch
+++ b/RackTables-Fedora-paths.patch
@@ -1,26 +1,17 @@
-diff -ru RackTables-0.19.12.orig/scripts/syncdomain.php RackTables-0.19.12/scripts/syncdomain.php
---- RackTables-0.19.12.orig/scripts/syncdomain.php	2012-03-14 20:58:35.000000000 +0800
-+++ RackTables-0.19.12/scripts/syncdomain.php	2012-04-15 13:26:21.612466742 +0800
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/php
-+#!/usr/bin/php
- <?php
- 
- # This file is a part of RackTables, a datacenter and server room management
-diff -ru RackTables-0.19.12.orig/wwwroot/inc/pre-init.php RackTables-0.19.12/wwwroot/inc/pre-init.php
---- RackTables-0.19.12.orig/wwwroot/inc/pre-init.php	2012-03-14 20:58:35.000000000 +0800
-+++ RackTables-0.19.12/wwwroot/inc/pre-init.php	2012-04-15 13:27:46.210465219 +0800
-@@ -24,11 +24,11 @@
+diff -ru RackTables-0.20.3.orig/wwwroot/inc/pre-init.php RackTables-0.20.3/wwwroot/inc/pre-init.php
+--- RackTables-0.20.3.orig/wwwroot/inc/pre-init.php	2012-12-20 00:30:47.000000000 +0800
++++ RackTables-0.20.3/wwwroot/inc/pre-init.php	2012-12-27 20:03:43.609459873 +0800
+@@ -25,11 +25,11 @@
  # code, multiple instances" deploy, in which case the paths could be changed
  # in the custom entry point wrapper (like own index.php)
  if (! isset ($racktables_staticdir)) // the directory containing 'pix', 'js', 'css' dirs
 -	$racktables_staticdir = $racktables_rootdir;
 +	$racktables_staticdir = '/usr/share/RackTables/static';
- if (! isset ($racktables_gwdir)) // the directory containing 'deviceconfig', 'sendfile' dirs, etc
+ if (! isset ($racktables_gwdir)) // the directory containing the 'telnet' and 'ssh' scripts
  	$racktables_gwdir = realpath ($racktables_rootdir . '/../gateways');
- if (! isset ($racktables_confdir)) // the directory containing local.php and secret.php (default is wwwroot/inc)
+ if (! isset ($racktables_confdir)) // the directory containing secret.php (default is wwwroot/inc)
 -	$racktables_confdir = dirname (__FILE__);
 +	$racktables_confdir = '/etc/RackTables';
- if (! isset ($path_to_secret_php))
+ if (! isset ($path_to_secret_php)) // you can overrride the path to secret.php separately from $racktables_confdir (legacy feature)
  	$path_to_secret_php = $racktables_confdir . '/secret.php';
- if (! isset ($path_to_local_php))
+ if (! isset ($racktables_plugins_dir)) // the directory where RT will load additional *.php files (like local.php) from
diff --git a/RackTables.spec b/RackTables.spec
index aecd051..289cdee 100644
--- a/RackTables.spec
+++ b/RackTables.spec
@@ -1,5 +1,5 @@
 Name:           RackTables
-Version:        0.19.12
+Version:        0.20.3
 Release:        2%{?dist}
 Summary:        A data-center asset management system
 
@@ -12,7 +12,7 @@ Source1:        README.Fedora
 Source2:        quickinstall.sh
 Patch1:         %{name}-Fedora-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       httpd php php-mysql php-pdo php-gd php-snmp php-mbstring mysql-server /bin/sh
+Requires:       httpd php php-mysql php-pdo php-gd php-snmp php-mbstring php-bcmath mysql-server /bin/sh
 BuildArch:      noarch
 
 %description
@@ -50,6 +50,12 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/secret.php
 %ghost %config(noreplace) %{_sysconfdir}/%{name}/secret.php
 
 %changelog
+* Thu Dec 27 2012 Colin Coe <colin.coe at gmail.com> - 0.20.3-2
+- Rebase to v0.20.3
+
+* Sun Nov 18 2012 Colin Coe <colin.coe at gmail.com> - 0.19.14-1
+- Rebase to v0.19.14
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.19.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 04fc493..e94723f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-088157c5f6a09ae13034588b0e33e4f9  RackTables-0.19.12.tar.gz
+edc51b04cb813e6d8720f767cf6905f2  RackTables-0.20.3.tar.gz


More information about the scm-commits mailing list