From 9f38f85b5dc7d906d48a06710a0e8d79222e7a47 Mon Sep 17 00:00:00 2001 From: marostegui Date: Wed, 19 Mar 2008 12:14:29 +0000 Subject: [PATCH] 2008-03-19 Manuel Arostegui * 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 --- pandora_console/ChangeLog | 5 +++++ pandora_console/pandora_console.spec | 24 +++++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index fcdb154c3c..8ab905a27d 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2008-03-19 Manuel Arostegui + + * pandora_console.spec: Solved a problem with Suse based + distros regarding to dependencies and apache's path. + 2008-03-13 Sancho Lerena * include/functions_db.php: Added show_server_type (): Return a string diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec index 3dae2825ca..707bc11ebf 100755 --- a/pandora_console/pandora_console.spec +++ b/pandora_console/pandora_console.spec @@ -2,7 +2,7 @@ # Pandora Console # %define name PandoraFMS_Console -%define version 1.3.0 +%define version 1.3.1 %define release 1 @@ -60,7 +60,7 @@ Group: Productivity/Networking/Web/Utilities Packager: Manuel Arostegui %if "%{_vendor}" == "suse" -Prefix: /srv/www +Prefix: /srv/www/htdocs %else Prefix: /var/www/html %endif @@ -70,8 +70,10 @@ BuildArchitectures: noarch AutoReq: 0 %if "%{_vendor}" == "suse" Requires: apache2 +Requires: php >= 4.3.0 +Requires: php-gd +Requires: mysql, php-mysql, php-snmp, php-pear -Requires: mysql, php4-mysql %else %if %{is_apache} Requires: apache @@ -80,7 +82,7 @@ Requires: httpd %endif Requires: php >= 4.3.0 Requires: php-gd -Requires: mysql, mysql-server, php-mysql +Requires: mysql, mysql-server, php-mysql, php-snmp, php-pear %endif Provides: %{name}-%{version} @@ -102,12 +104,12 @@ rm -rf $RPM_BUILD_ROOT %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{prefix}/pandora_console -mkdir -p $RPM_BUILD_ROOT/usr/share/ -mkdir -p $RPM_BUILD_ROOT/usr/share/man/ -mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1/ +#mkdir -p $RPM_BUILD_ROOT/usr/share/ +#mkdir -p $RPM_BUILD_ROOT/usr/share/man/ +#mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1/ cp -aRf * $RPM_BUILD_ROOT%{prefix}/pandora_console -cp pandora.1 $RPM_BUILD_ROOT/usr/share/man/man1/ -cp pandora_console.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/ if [ -f $RPM_BUILD_ROOT%{prefix}/%{name}/%{name}.spec ] ; then rm $RPM_BUILD_ROOT%{prefix}/%{name}/%{name}.spec fi @@ -120,5 +122,5 @@ echo "Please, now, point your broswer to http://localhost/pandora_console/instal %defattr(0644,%{httpd_user},%{httpd_group},0755) %docdir %{prefix}/pandora_console/docs %{prefix}/pandora_console -%{_mandir}/man1/pandora.1.gz -%{_mandir}/man1/pandora_console.1.gz +#%{_mandir}/man1/pandora.1.gz +#%{_mandir}/man1/pandora_console.1.gz