2012-06-27 Koichio Kikuchi <koichiro@rworks.jp>

* pandora_console.redhat.spec: Changed php dependencies so that the
	 RPM package can be installed into RHEL/CentOS 5. Also removed unused
	 lines.

	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6720 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
koichirok 2012-06-27 07:16:00 +00:00
parent b0b18689c5
commit 638d8b183e
2 changed files with 13 additions and 11 deletions

View File

@ -1,3 +1,11 @@
2012-06-27 Koichio Kikuchi <koichiro@rworks.jp>
* pandora_console.redhat.spec: Changed php dependencies so that the
RPM package can be installed into RHEL/CentOS 5. Also removed unused
lines.
Merged from 4.0.2
2012-06-26 Miguel de Dios <miguel.dedios@artica.es> 2012-06-26 Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN/control: removed the dependency for "mysql-server" because * DEBIAN/control: removed the dependency for "mysql-server" because

View File

@ -5,15 +5,11 @@
%define version 5.0dev %define version 5.0dev
%define release 1 %define release 1
%define httpd_name httpd
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name httpd %define httpd_name httpd
%define httpd_user apache %define httpd_user apache
%define httpd_group apache %define httpd_group apache
# Evaluate PHP version
%define phpver_lt_430 %(out=`rpm -q --queryformat='%{VERSION}' php` 2>&1 >/dev/null || out=0 ; out=`echo $out | tr . : | sed s/://g` ; if [ $out -lt 430 ] ; then out=1 ; else out=0; fi ; echo $out)
Summary: Pandora FMS Console Summary: Pandora FMS Console
Name: %{name} Name: %{name}
Version: %{version} Version: %{version}
@ -27,12 +23,12 @@ Group: Productivity/Networking/Web/Utilities
Packager: Sancho Lerena <slerena@artica.es> Packager: Sancho Lerena <slerena@artica.es>
Prefix: /var/www/html Prefix: /var/www/html
BuildRoot: %{_tmppath}/%{name} BuildRoot: %{_tmppath}/%{name}
BuildArchitectures: noarch BuildArch: noarch
AutoReq: 0 AutoReq: 0
Requires: httpd >= 2.0.0 Requires: %{httpd_name} >= 2.0.0
Requires: php >= 5.2.0 Requires: mod_php >= 5.2.0
Requires: php-gd, php-snmp Requires: php-gd, php-ldap, php-snmp, php-session, php-gettext
Requires: php-mysql, php-ldap, php-mbstring, php, php-common Requires: php-mysql, php-mbstring, php-zip, php-zlib, php-curl
Requires: xorg-x11-fonts-75dpi, xorg-x11-fonts-misc Requires: xorg-x11-fonts-75dpi, xorg-x11-fonts-misc
Requires: graphviz Requires: graphviz
Provides: %{name}-%{version} Provides: %{name}-%{version}
@ -70,7 +66,6 @@ else
echo "Please, now, point your browser to http://your_IP_address/pandora_console/install.php and follow all the steps described on it." echo "Please, now, point your browser to http://your_IP_address/pandora_console/install.php and follow all the steps described on it."
fi fi
%preun %preun
# Upgrading # Upgrading
@ -83,6 +78,5 @@ fi
%docdir %{prefix}/pandora_console/docs %docdir %{prefix}/pandora_console/docs
%{prefix}/pandora_console %{prefix}/pandora_console
%defattr(770,pandora,%{httpd_group}) %defattr(770,pandora,%{httpd_group})
/var/spool/pandora/data_in /var/spool/pandora/data_in