Submitted By: Mario Fetka (mario.fetka@gmail.com)
Date: 2010-10-13
Initial Package Version: 6.40.2
Origin: me
Upstream Status: gentoo specific
Description: this patch correct the install dir for the default install target from /etc/sysconfig to the gentoo equivalent /etc/conf.d
 
diff -Naur zarafa-6.40.2.orig/installer/linux/Makefile.am zarafa-6.40.2/installer/linux/Makefile.am
--- zarafa-6.40.2.orig/installer/linux/Makefile.am	2010-10-13 08:26:21.000000000 +0000
+++ zarafa-6.40.2/installer/linux/Makefile.am	2010-10-13 08:28:26.000000000 +0000
@@ -26,7 +26,7 @@
 sysconf_initdir=${sysconfdir}/init.d
 sysconf_init_SCRIPTS = ${@DISTRO@_initscript_files}
 
-rhel_sysconfig_path = ${sysconfdir}/sysconfig
+rhel_sysconfig_path = ${sysconfdir}/conf.d
 suse_sysconfig_path = ${localstatedir}/adm/fillup-templates
 sles_sysconfig_path = ${localstatedir}/adm/fillup-templates
 sysconf_sysconfigdir = ${@DISTRO@_sysconfig_path}
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany zarafa-6.40.2/installer/userscripts/createcompany
--- zarafa-6.40.2.orig/installer/userscripts/createcompany	2010-10-13 08:26:21.000000000 +0000
+++ zarafa-6.40.2/installer/userscripts/createcompany	2010-10-13 08:26:53.000000000 +0000
@@ -9,8 +9,8 @@
 # beware that this string can contain any characters, so take heed to
 # correct quoting.
 
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
-  . ${prefix}/etc/sysconfig/zarafa
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
+  . ${prefix}/etc/conf.d/zarafa
 fi
 
 ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/createcompany.d
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany.in zarafa-6.40.2/installer/userscripts/createcompany.in
--- zarafa-6.40.2.orig/installer/userscripts/createcompany.in	2010-10-13 08:26:21.000000000 +0000
+++ zarafa-6.40.2/installer/userscripts/createcompany.in	2010-10-13 08:27:00.000000000 +0000
@@ -9,8 +9,8 @@
 # beware that this string can contain any characters, so take heed to
 # correct quoting.
 
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
-  . @sysconfdir@/sysconfig/zarafa
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
+  . @sysconfdir@/conf.d/zarafa
 fi
 
 ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/createcompany.d
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup zarafa-6.40.2/installer/userscripts/creategroup
--- zarafa-6.40.2.orig/installer/userscripts/creategroup	2010-10-13 08:26:21.000000000 +0000
+++ zarafa-6.40.2/installer/userscripts/creategroup	2010-10-13 08:27:04.000000000 +0000
@@ -9,8 +9,8 @@
 # beware that this string can contain any characters, so take heed to
 # correct quoting.
 
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
-  . ${prefix}/etc/sysconfig/zarafa
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
+  . ${prefix}/etc/conf.d/zarafa
 fi
 
 ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/creategroup.d
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup.in zarafa-6.40.2/installer/userscripts/creategroup.in
--- zarafa-6.40.2.orig/installer/userscripts/creategroup.in	2010-10-13 08:26:21.000000000 +0000
+++ zarafa-6.40.2/installer/userscripts/creategroup.in	2010-10-13 08:27:08.000000000 +0000
@@ -9,8 +9,8 @@
 # beware that this string can contain any characters, so take heed to
 # correct quoting.
 
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
-  . @sysconfdir@/sysconfig/zarafa
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
+  . @sysconfdir@/conf.d/zarafa
 fi
 
 ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/creategroup.d
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser zarafa-6.40.2/installer/userscripts/createuser
--- zarafa-6.40.2.orig/installer/userscripts/createuser	2010-10-13 08:26:21.000000000 +0000
+++ zarafa-6.40.2/installer/userscripts/createuser	2010-10-13 08:27:12.000000000 +0000
@@ -9,8 +9,8 @@
 # beware that this string can contain any characters, so take heed to
 # correct quoting.
 
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
-  . ${prefix}/etc/sysconfig/zarafa
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
+  . ${prefix}/etc/conf.d/zarafa
 fi
 
 ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/createuser.d
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser.in zarafa-6.40.2/installer/userscripts/createuser.in
--- zarafa-6.40.2.orig/installer/userscripts/createuser.in	2010-10-13 08:26:21.000000000 +0000
+++ zarafa-6.40.2/installer/userscripts/createuser.in	2010-10-13 08:27:17.000000000 +0000
@@ -9,8 +9,8 @@
 # beware that this string can contain any characters, so take heed to
 # correct quoting.
 
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
-  . @sysconfdir@/sysconfig/zarafa
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
+  . @sysconfdir@/conf.d/zarafa
 fi
 
 ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/createuser.d
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany zarafa-6.40.2/installer/userscripts/deletecompany
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany	2010-10-13 08:26:21.000000000 +0000
+++ zarafa-6.40.2/installer/userscripts/deletecompany	2010-10-13 08:27:22.000000000 +0000
@@ -9,8 +9,8 @@
 # beware that this string can contain any characters, so take heed to
 # correct quoting.
 
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
-  . ${prefix}/etc/sysconfig/zarafa
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
+  . ${prefix}/etc/conf.d/zarafa
 fi
 
 ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/deletecompany.d
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany.in zarafa-6.40.2/installer/userscripts/deletecompany.in
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany.in	2010-10-13 08:26:21.000000000 +0000
+++ zarafa-6.40.2/installer/userscripts/deletecompany.in	2010-10-13 08:27:26.000000000 +0000
@@ -9,8 +9,8 @@
 # beware that this string can contain any characters, so take heed to
 # correct quoting.
 
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
-  . @sysconfdir@/sysconfig/zarafa
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
+  . @sysconfdir@/conf.d/zarafa
 fi
 
 ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/deletecompany.d
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup zarafa-6.40.2/installer/userscripts/deletegroup
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup	2010-10-13 08:26:21.000000000 +0000
+++ zarafa-6.40.2/installer/userscripts/deletegroup	2010-10-13 08:27:30.000000000 +0000
@@ -9,8 +9,8 @@
 # beware that this string can contain any characters, so take heed to
 # correct quoting.
 
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
-  . ${prefix}/etc/sysconfig/zarafa
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
+  . ${prefix}/etc/conf.d/zarafa
 fi
 
 ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/deletegroup.d
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup.in zarafa-6.40.2/installer/userscripts/deletegroup.in
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup.in	2010-10-13 08:26:21.000000000 +0000
+++ zarafa-6.40.2/installer/userscripts/deletegroup.in	2010-10-13 08:27:35.000000000 +0000
@@ -9,8 +9,8 @@
 # beware that this string can contain any characters, so take heed to
 # correct quoting.
 
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
-  . @sysconfdir@/sysconfig/zarafa
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
+  . @sysconfdir@/conf.d/zarafa
 fi
 
 ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/deletegroup.d
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser zarafa-6.40.2/installer/userscripts/deleteuser
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser	2010-10-13 08:26:21.000000000 +0000
+++ zarafa-6.40.2/installer/userscripts/deleteuser	2010-10-13 08:27:39.000000000 +0000
@@ -9,8 +9,8 @@
 # that this string can contain any characters, so take heed to correct
 # quoting.
 
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
-  . ${prefix}/etc/sysconfig/zarafa
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
+  . ${prefix}/etc/conf.d/zarafa
 fi
 
 ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/deleteuser.d
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser.in zarafa-6.40.2/installer/userscripts/deleteuser.in
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser.in	2010-10-13 08:26:21.000000000 +0000
+++ zarafa-6.40.2/installer/userscripts/deleteuser.in	2010-10-13 08:27:43.000000000 +0000
@@ -9,8 +9,8 @@
 # that this string can contain any characters, so take heed to correct
 # quoting.
 
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
-  . @sysconfdir@/sysconfig/zarafa
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
+  . @sysconfdir@/conf.d/zarafa
 fi
 
 ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/deleteuser.d