[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. dac79561085739c0e1104257ba95eb3afb812705

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. dac79561085739c0e1104257ba95eb3afb812705

[git]

[-- Attachment #1: Type: text/plain, Size: 3690 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  dac79561085739c0e1104257ba95eb3afb812705 (commit)
      from  92f0fb3fbbd8be37f05e27ea760d47d4f5cfdfe7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dac79561085739c0e1104257ba95eb3afb812705
Author: Christian Schmidt <christian.schmidt(a)ipfire.org>
Date:   Sat May 12 18:23:13 2012 +0200

    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

-----------------------------------------------------------------------

Summary of changes:
 c_icap/c_icap.nm                 |   11 +++++++++--
 c_icap_modules/c_icap_modules.nm |   14 ++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/c_icap/c_icap.nm b/c_icap/c_icap.nm
index 53d74bc..acf65d0 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(a)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 5f34d46..d6e2911 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(a)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


hooks/post-receive
--
IPFire 3.x development tree