2008-03-19 Manuel Arostegui <marostegui@artica.es>

* pandora_console.spec: Solved a problem with Suse based
          distros regarding to dependencies and apache's path.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@759 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
marostegui 2008-03-19 12:14:29 +00:00
parent 9a0d5caaf8
commit ba8e994243
2 changed files with 18 additions and 11 deletions

View File

@ -1,3 +1,8 @@
2008-03-19 Manuel Arostegui <marostegui@artica.es>
* pandora_console.spec: Solved a problem with Suse based
distros regarding to dependencies and apache's path.
2008-03-13 Sancho Lerena <slerena@gmail.com> 2008-03-13 Sancho Lerena <slerena@gmail.com>
* include/functions_db.php: Added show_server_type (): Return a string * include/functions_db.php: Added show_server_type (): Return a string

View File

@ -2,7 +2,7 @@
# Pandora Console # Pandora Console
# #
%define name PandoraFMS_Console %define name PandoraFMS_Console
%define version 1.3.0 %define version 1.3.1
%define release 1 %define release 1
@ -60,7 +60,7 @@ Group: Productivity/Networking/Web/Utilities
Packager: Manuel Arostegui <marostegui@artica.es> Packager: Manuel Arostegui <marostegui@artica.es>
%if "%{_vendor}" == "suse" %if "%{_vendor}" == "suse"
Prefix: /srv/www Prefix: /srv/www/htdocs
%else %else
Prefix: /var/www/html Prefix: /var/www/html
%endif %endif
@ -70,8 +70,10 @@ BuildArchitectures: noarch
AutoReq: 0 AutoReq: 0
%if "%{_vendor}" == "suse" %if "%{_vendor}" == "suse"
Requires: apache2 Requires: apache2
Requires: php >= 4.3.0
Requires: php-gd
Requires: mysql, php-mysql, php-snmp, php-pear
Requires: mysql, php4-mysql
%else %else
%if %{is_apache} %if %{is_apache}
Requires: apache Requires: apache
@ -80,7 +82,7 @@ Requires: httpd
%endif %endif
Requires: php >= 4.3.0 Requires: php >= 4.3.0
Requires: php-gd Requires: php-gd
Requires: mysql, mysql-server, php-mysql Requires: mysql, mysql-server, php-mysql, php-snmp, php-pear
%endif %endif
Provides: %{name}-%{version} Provides: %{name}-%{version}
@ -102,12 +104,12 @@ rm -rf $RPM_BUILD_ROOT
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{prefix}/pandora_console mkdir -p $RPM_BUILD_ROOT%{prefix}/pandora_console
mkdir -p $RPM_BUILD_ROOT/usr/share/ #mkdir -p $RPM_BUILD_ROOT/usr/share/
mkdir -p $RPM_BUILD_ROOT/usr/share/man/ #mkdir -p $RPM_BUILD_ROOT/usr/share/man/
mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1/ #mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1/
cp -aRf * $RPM_BUILD_ROOT%{prefix}/pandora_console cp -aRf * $RPM_BUILD_ROOT%{prefix}/pandora_console
cp pandora.1 $RPM_BUILD_ROOT/usr/share/man/man1/ #cp pandora.1 $RPM_BUILD_ROOT/usr/share/man/man1/
cp pandora_console.1 $RPM_BUILD_ROOT/usr/share/man/man1/ #cp pandora_console.1 $RPM_BUILD_ROOT/usr/share/man/man1/
if [ -f $RPM_BUILD_ROOT%{prefix}/%{name}/%{name}.spec ] ; then if [ -f $RPM_BUILD_ROOT%{prefix}/%{name}/%{name}.spec ] ; then
rm $RPM_BUILD_ROOT%{prefix}/%{name}/%{name}.spec rm $RPM_BUILD_ROOT%{prefix}/%{name}/%{name}.spec
fi fi
@ -120,5 +122,5 @@ echo "Please, now, point your broswer to http://localhost/pandora_console/instal
%defattr(0644,%{httpd_user},%{httpd_group},0755) %defattr(0644,%{httpd_user},%{httpd_group},0755)
%docdir %{prefix}/pandora_console/docs %docdir %{prefix}/pandora_console/docs
%{prefix}/pandora_console %{prefix}/pandora_console
%{_mandir}/man1/pandora.1.gz #%{_mandir}/man1/pandora.1.gz
%{_mandir}/man1/pandora_console.1.gz #%{_mandir}/man1/pandora_console.1.gz