Fixes to the packaging after a first test on CentOS

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@3023 a333f486-631f-4898-b8df-5754b55c2be0

setup/install/install.sh

@@ -4,7 +4,7 @@
 #
 # $Id$
 #
-#set -x
+#set -v
 
 if [ "_$_ITOP_SYSCONFDIR_" = "_" ]; then
 	_ITOP_SYSCONFDIR_="/etc"
@@ -23,6 +23,8 @@ if [ "_$PREFIX" != "_" ]; then
 	subconf=$_ITOP_SYSCONFDIR_/$_ITOP_NAME_
 	var=${HEAD}$_ITOP_VARDIR_
 	subvar=$_ITOP_VARDIR_
+	webconf=${HEAD}$_ITOP_WEBCONFDIR_
+	subwebconf=$_ITOP_WEBCONFDIR_
 else
 	local=/usr/local
 	sublocal=$local
@@ -30,6 +32,8 @@ else
 	subconf=$conf
 	var=$local/$_ITOP_VARDIR_
 	subvar=$var
+	webconf=$local/$_ITOP_WEBCONFDIR_ 
+	subwebconf=$_ITOP_WEBCONFDIR_
 fi
 
 if [ "_$_ITOP_WEBCONFDIR_" = "_" ]; then
@@ -83,12 +87,13 @@ ln -s $subvar/lib/$_ITOP_NAME_/data data ;\
 
 
 if [ _"$HEAD" != _"" ]; then
-	install -m 755 -d $_ITOP_WEBCONFDIR_/conf.d $conf/../cron.d
+	echo Creating $webconf/conf.d and $conf/../cron.d directories
+	install -m 755 -d $webconf/conf.d $conf/../cron.d
 fi
 
 # Substitute variables for templates
-sed -e "s~_ITOP_NAME_~$_ITOP_NAME_~g" -e "s~_ITOP_SYSCONFDIR_~$conf~g" -e "s~_ITOP_DATADIR_~$sublocal/share~g" -e "s~_ITOP_LOGDIR_~$subvar/log~g" ./web/setup/install/apache.conf.tpl > $_ITOP_WEBCONFDIR_/conf.d/$_ITOP_NAME_.conf
-sed -e "s~_ITOP_NAME_~$_ITOP_NAME_~g" -e "s~_ITOP_SYSCONFDIR_~$conf~g" -e "s~_ITOP_DATADIR_~$sublocal/share~g" -e "s~_ITOP_LOGDIR_~$subvar/log~g" ./web/setup/install/cron.tpl > $conf/../cron.d/$_ITOP_NAME_
+sed -e "s~_ITOP_NAME_~$_ITOP_NAME_~g" -e "s~_ITOP_SYSCONFDIR_~$subconf~g" -e "s~_ITOP_DATADIR_~$sublocal/share~g" -e "s~_ITOP_LOGDIR_~$subvar/log~g" ./web/setup/install/apache.conf.tpl > $webconf/conf.d/$_ITOP_NAME_.conf
+sed -e "s~_ITOP_NAME_~$_ITOP_NAME_~g" -e "s~_ITOP_SYSCONFDIR_~$subconf~g" -e "s~_ITOP_DATADIR_~$sublocal/share~g" -e "s~_ITOP_LOGDIR_~$subvar/log~g" ./web/setup/install/cron.tpl > $conf/../cron.d/$_ITOP_NAME_
 chmod 644 $_ITOP_WEBCONFDIR_/conf.d/$_ITOP_NAME_.conf $conf/../cron.d/$_ITOP_NAME_
 
 exit 0

setup/packaging/rpm/itop-itsm.spec

@@ -1,29 +1,29 @@
-%define webconfdir %{?_webconfdir:%{_sysconfdir}/httpd}
-%define logdir %{?_logdir:%{_var}/log}
+%define webconfdir %{?_webconfdir}%{!?_webconfdir:%{_sysconfdir}/httpd}
+%define logdir %{?_logdir}%{!?_logdir:%{_var}/log}
 
 Name: itop-itsm
 Version: 2.0.2
 Release: 1%{?dist}
-# Use a variable below
+# TODO: Use a variable below
 Summary: iTop: IT Operational Portal
-# Use a variable below	
+# TODO: Use a variable below
 Group: Applications/Databases 
 License: AGPLv3+
-URL: http://www.combodo.com/itop		
-Source0: iTop-2.0.2-beta-1416.zip
+URL: http://www.combodo.com/itop
+Source0: iTop-2.0.2-beta-1462.zip
 #Source4: install.sh
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Use a variable below
+# TODO: Use a variable below
 Requires: php >= 5.2.0, php-mysql, php-mcrypt, php-xml, php-cli, php-soap, graphviz
 #, php-pecl-apc
-# Use a variable below
+# TODO: Use a variable below
 BuildRequires: unzip
 
-# Use a variable below
+# TODO: Use a variable below
 %description
-iTop is an open source CMDB...
+iTop is an open source CMDB.
 
 %prep
 %setup -c %{name}
@@ -36,7 +36,7 @@ rm -rf %{buildroot}
 
 export _ITOP_NAME_=%{name}
 export _ITOP_SYSCONFDIR_=%{_sysconfdir}
-export _ITOP_WEBCONFDIR_=%{buildroot}/%{webconfdir}
+export _ITOP_WEBCONFDIR_=%{webconfdir}
 export _ITOP_VARDIR_=%{_var}
 export PREFIX=%{_prefix}
 export HEAD=%{buildroot}
@@ -55,11 +55,12 @@ rm -rf %{buildroot}
 %{_sysconfdir}/cron.d/%{name}
 %{_var}/lib/%{name}/approot.inc.php
 
-# Use a variable below
+# TODO: Use a variable below
 %defattr(-,apache,root,-)
 %dir %{_sysconfdir}/%{name}
 #%config(noreplace) %{_sysconfdir}/%{name}/production/cron.params
 %dir %{_sysconfdir}/%{name}/test
+%dir %{_sysconfdir}/%{name}/production
 %dir %{_sysconfdir}/%{name}/toolkit
 %dir %{logdir}/%{name}
 %dir %{_var}/lib/%{name}/env-production