From: Christian Schmidt <christian.schmidt@ipfire.org>
Date: Sat, 12 May 2012 16:23:13 +0000 (+0200)
Subject: icap: Changed config file directory.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dac79561085739c0e1104257ba95eb3afb812705;p=ipfire-3.x.git

icap: Changed config file directory.

There is a dependency when building the packages, the modules seem
to rely on the master sysconfdir and ignoring there own sysconfdir.
This is whierd when building the modules with the old icap master
packages leading to config files in /etc even when you point it
elsewhere. You need to build the icap packages first and point the
sysconfdir to /etc/anywhere and then the modules will install there
too, ignoring what you´ve configured with the sysconfdir for the
package.

Thats why both will install in /etc/c-icap because you can not link
the modules elsewhere.

Fixes #10125
---

diff --git a/c_icap/c_icap.nm b/c_icap/c_icap.nm
index 53d74bcf4..acf65d0c3 100644
--- a/c_icap/c_icap.nm
+++ b/c_icap/c_icap.nm
@@ -5,7 +5,7 @@
 
 name       = c_icap
 version    = 0.1.7
-release    = 2
+release    = 3
 
 maintainer = Christian Schmidt <christian.schmidt@ipfire.org>
 groups     = Networking/Daemons
@@ -33,7 +33,7 @@ build
 	configure_options += \
 		--enable-large-files \
 		--enable-ipv6 \
-		--sysconfdir=/etc \
+		--sysconfdir=/etc/c-icap \
 		--localstatedir=/var
 
 	prepare_cmds
@@ -50,6 +50,13 @@ end
 packages
 	package %{name}
 		requires = %{name}_modules
+
+		configfiles
+			/etc/c-icap/c-icap.conf
+			/etc/c-icap/c-icap.conf.default
+			/etc/c-icap/c-icap.magic
+			/etc/c-icap/c-icap.magic.default
+		end
 	end
 
 	package %{name}-debuginfo
diff --git a/c_icap_modules/c_icap_modules.nm b/c_icap_modules/c_icap_modules.nm
index 5f34d46a6..d6e2911c8 100644
--- a/c_icap_modules/c_icap_modules.nm
+++ b/c_icap_modules/c_icap_modules.nm
@@ -5,7 +5,7 @@
 
 name       = c_icap_modules
 version    = 0.1.6
-release    = 1
+release    = 2
 
 maintainer = Christian Schmidt <christian.schmidt@ipfire.org>
 groups     = Networking/Daemons
@@ -25,14 +25,14 @@ build
 	requires
 		autoconf
 		automake
-		c_icap
+		c_icap >= 0.1.7-3
 		clamav-devel
 		db4-devel
 		libtool-devel
 	end
 
 	configure_options += \
-		--sysconfdir=/etc \
+		--sysconfdir=/etc/c-icap \
 		--localstatedir=/var
 
 	prepare_cmds
@@ -40,13 +40,19 @@ build
 	end
 
 	install
-		mkdir -pv %{BUILDROOT}/etc
+		mkdir -pv %{BUILDROOT}/etc/c-icap
 		make install DESTDIR=%{BUILDROOT}
 	end
 end
 
 packages
 	package %{name}
+		configfiles
+			/etc/c-icap/srv_clamav.conf
+			/etc/c-icap/srv_clamav.conf.default
+			/etc/c-icap/srv_url_check.conf
+			/etc/c-icap/srv_url_check.conf.default
+		end
 	end
 
 	package %{name}-debuginfo