[monitorix/el6: 6/6] Merge branch 'master' into el6

[Christopher Meng]

commit ea5adb0e81f543b4420353d820f76c6e4a35a53a
Merge: 51cc06e 2043475
Author: Koji <koji at fedoraproject.org>
Date:   Tue Aug 13 18:41:16 2013 +0800

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	monitorix.spec
    	sources

 .gitignore     |    4 ++++
 monitorix.spec |    8 +++++---
 sources        |    3 +--
 3 files changed, 10 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index 8c04939,7ce5a0a..8438ca6
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,6 @@@
  /monitorix-3.2.0.tar.gz
  /monitorix-3.2.1.tar.gz
++<<<<<<< HEAD
++=======
+ /monitorix-3.3.0.tar.gz
++>>>>>>> master
diff --cc monitorix.spec
index 9c5b960,f434180..5f30d4f
--- a/monitorix.spec
+++ b/monitorix.spec
@@@ -1,28 -1,28 +1,27 @@@
  %global __requires_exclude perl\\(Monitorix\\)|perl\\(HTTPServer\\)
  %global __provides_exclude perl\\(
  
 -Name:              monitorix
 -Version:           3.3.0
 -Release:           1%{?dist}
 -Summary:           A free, open source, lightweight system monitoring tool
 -License:           GPLv2+
 -URL:               http://www.monitorix.org
 -Source0:           http://www.monitorix.org/%{name}-%{version}.tar.gz
 -
 -BuildArch:         noarch
 -BuildRequires:     perl
 -BuildRequires:     systemd
 -Requires:          logrotate
 -Requires:          perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 -Requires:          perl(CGI)
 -Requires:          perl(Config::General)
 -Requires:          perl(DBD::mysql)
 -Requires:          perl(DBI)
 -Requires:          perl(HTTP::Server::Simple::CGI)
 -Requires:          perl(XML::Simple)
 -Requires(post):    systemd
 -Requires(preun):   systemd
 -Requires(postun):  systemd
 +Name:             monitorix
- Version:          3.2.1
- Release:          2%{?dist}
++Version:          3.3.0
++Release:          1%{?dist}
 +Summary:          A free, open source, lightweight system monitoring tool
 +License:          GPLv2+
 +URL:              http://www.monitorix.org
 +Source0:          http://www.monitorix.org/%{name}-%{version}.tar.gz
- 
 +BuildArch:        noarch
 +BuildRequires:    perl
 +Requires:         logrotate
 +Requires:         perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 +Requires:         perl(CGI)
 +Requires:         perl(Config::General)
 +Requires:         perl(DBD::mysql)
 +Requires:         perl(DBI)
 +Requires:         perl(HTTP::Server::Simple::CGI)
 +Requires:         perl(XML::Simple)
 +Requires(post):   chkconfig
 +Requires(preun):  chkconfig
 +Requires(preun):  initscripts
 +BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
  Monitorix is a free, open source, lightweight system monitoring tool designed
@@@ -97,8 -93,14 +96,11 @@@ rm -rf %{buildroot
  %attr(755,root,root) %{_localstatedir}/lib/%{name}/usage
  
  %changelog
+ * Tue Aug 13 2013 Christopher Meng <rpm at cicku.me> - 3.3.0-1
+ - New release.
+ 
 -* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.1-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 -
 -* Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 3.2.1-2
 -- Perl 5.18 rebuild
 +* Wed Aug 07 2013 Christopher Meng <rpm at cicku.me> - 3.2.1-2
 +- Fix wrong init file permission.
  
  * Wed Jun 05 2013 Christopher Meng <rpm at cicku.me> - 3.2.1-1
  - New release.