From 717ca8b19c7a75e2301dfd2ae58568fe0892d890 Mon Sep 17 00:00:00 2001
From: Alexander Mueller <alexander.mueller@hs.uni-hamburg.de>
Date: Wed, 2 Nov 2005 12:28:18 +0000
Subject: [PATCH] BugID: 377 Some more cosmetic changes for rpm building and
 change release nr. from 6.0 to 6.1.

---
 MAC/GCF/GCFCommon/configure.in              |  2 +-
 MAC/GCF/LogSys/CLP/src/Makefile.am          |  4 +---
 MAC/GCF/LogSys/GCFLogSys.spec.in            |  8 ++++----
 MAC/GCF/LogSys/KVLogSys/src/Makefile.am     | 10 ++--------
 MAC/GCF/LogSys/configure.in                 |  2 +-
 MAC/GCF/Protocols/GCFProtocols.spec.in      |  4 ++--
 MAC/GCF/Protocols/configure.in              |  2 +-
 MAC/GCF/Protocols/src/Makefile.am           | 18 +++++++-----------
 MAC/GCF/TM/GCFTM.spec.in                    |  7 ++++++-
 MAC/GCF/TM/configure.in                     |  2 +-
 MAC/GCF/TM/src/Makefile.am                  | 11 ++++-------
 MAC/GCF/TM/src/ServiceBroker/Makefile.am    |  9 ++++++---
 MAC/GCF/TM/src/ServiceBroker/gcf-sb.conf.in |  2 ++
 MAC/GCF/TM/test/Makefile.am                 | 11 ++++-------
 MAC/GCF/_PAL/GCFPAL.spec.in                 |  6 +++---
 MAC/GCF/_PAL/PA/src/Makefile.am             |  5 +----
 MAC/GCF/_PAL/PML/src/Makefile.am            |  2 +-
 MAC/GCF/_PAL/SAL/test/Makefile.am           | 12 ++++--------
 MAC/GCF/_PAL/configure.in                   |  2 +-
 MAC/GCF/_PALlight/GCFPALlight.spec.in       |  8 ++++----
 MAC/GCF/_PALlight/PMLlight/src/Makefile.am  |  2 +-
 MAC/GCF/_PALlight/configure.in              |  2 +-
 22 files changed, 58 insertions(+), 73 deletions(-)

diff --git a/MAC/GCF/GCFCommon/configure.in b/MAC/GCF/GCFCommon/configure.in
index 2aed4a9259a..14b48495f5f 100644
--- a/MAC/GCF/GCFCommon/configure.in
+++ b/MAC/GCF/GCFCommon/configure.in
@@ -5,7 +5,7 @@ AC_INIT(include/GCF/GCF_Defines.h)
 dnl AC_CONFIG_AUX_DIR(config)
 dnl AM_CONFIG_HEADER(config/config.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(GCFCommon, 6.0, no-define)
+AM_INIT_AUTOMAKE(GCFCommon, 6.1, no-define)
 
 dnl Initialize for LOFAR (may set compilers)
 lofar_INIT
diff --git a/MAC/GCF/LogSys/CLP/src/Makefile.am b/MAC/GCF/LogSys/CLP/src/Makefile.am
index 790948c3041..e6dd429d2b6 100644
--- a/MAC/GCF/LogSys/CLP/src/Makefile.am
+++ b/MAC/GCF/LogSys/CLP/src/Makefile.am
@@ -21,9 +21,7 @@ CodeLoggingProcessor_DEPENDENCIES	= libclp.la $(LOFAR_DEPEND) \
 
 BUILT_SOURCES =
 
-EXTRA_DIST = $(BUILT_SOURCES) \
-	CodeLoggingProcessor.conf.in \
-	CodeLoggingProcessor.log_prop.in
+EXTRA_DIST = $(sysconf_DATA)
 
 sysconf_DATA= \
 	CodeLoggingProcessor.conf \
diff --git a/MAC/GCF/LogSys/GCFLogSys.spec.in b/MAC/GCF/LogSys/GCFLogSys.spec.in
index c7393e48bb7..3f76879b2e7 100644
--- a/MAC/GCF/LogSys/GCFLogSys.spec.in
+++ b/MAC/GCF/LogSys/GCFLogSys.spec.in
@@ -29,10 +29,10 @@ URL: http://www.astron.nl
 Prefix: %{prefix}
 BuildArchitectures: i386 # Target platforms, i.e., i586
 Requires: Common >= 2.2
-Requires: GCFCommon >= 6.0
-Requires: GCFTM >= 6.0
-Requires: GCFProtocols >= 6.0
-Requires: GCFPAL >= 6.0
+Requires: GCFCommon >= 6.1
+Requires: GCFTM >= 6.1
+Requires: GCFProtocols >= 6.1
+Requires: GCFPAL >= 6.1
 #Requires: OTDB
 Packager: %{packager}
 Distribution: The LOFAR project
diff --git a/MAC/GCF/LogSys/KVLogSys/src/Makefile.am b/MAC/GCF/LogSys/KVLogSys/src/Makefile.am
index ee2c4f56edc..45ccf67fb2b 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/Makefile.am
+++ b/MAC/GCF/LogSys/KVLogSys/src/Makefile.am
@@ -51,12 +51,9 @@ KeyValueLoggerMaster_LDADD		    = libkvlm.la $(LOFAR_DEPEND)
 KeyValueLoggerMaster_DEPENDENCIES	= libkvlm.la $(LOFAR_DEPEND)
 KeyValueLoggerMaster_CPPFLAGS			= $(libkvlm_la_CPPFLAGS)
 
-BUILT_SOURCES = \
-	KVL_Protocol.ph
+BUILT_SOURCES = 
 
-EXTRA_DIST = $(BUILT_SOURCES) \
-	KeyValueLoggerSys.conf.in \
-	KeyValueLoggerSys.log_prop.in
+EXTRA_DIST = KVL_Protocol.prot $(sysconf_DATA)
 	
 sysconf_DATA= \
 	KeyValueLoggerDaemon.conf \
@@ -71,8 +68,5 @@ sysconf_DATA= \
 %.log_prop: KeyValueLoggerSys.log_prop.in
 	cp $< $@
 	
-clean-local:
-	rm -f *.ph
-
 include $(top_srcdir)/Makefile.common
 
diff --git a/MAC/GCF/LogSys/configure.in b/MAC/GCF/LogSys/configure.in
index 10d15dcb5ae..658b9188c6f 100644
--- a/MAC/GCF/LogSys/configure.in
+++ b/MAC/GCF/LogSys/configure.in
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl
 AC_INIT(include/GCF/LogSys/GCF_KeyValueLogger.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(GCFLogSys, 6.0, no-define)
+AM_INIT_AUTOMAKE(GCFLogSys, 6.1, no-define)
 
 dnl Initialize for LOFAR (may set compilers)
 lofar_INIT
diff --git a/MAC/GCF/Protocols/GCFProtocols.spec.in b/MAC/GCF/Protocols/GCFProtocols.spec.in
index bbce95a9f76..818ae01ff31 100644
--- a/MAC/GCF/Protocols/GCFProtocols.spec.in
+++ b/MAC/GCF/Protocols/GCFProtocols.spec.in
@@ -29,8 +29,8 @@ URL: http://www.astron.nl
 Prefix: %{prefix}
 BuildArchitectures: i386 # Target platforms, i.e., i586
 Requires: Common >= 2.2
-Requires: GCFCommon >= 6.0
-Requires: GCFTM >= 6.0
+Requires: GCFCommon >= 6.1
+Requires: GCFTM >= 6.1
 Requires: Transport >= 2.0
 Packager: %{packager}
 Distribution: The LOFAR project
diff --git a/MAC/GCF/Protocols/configure.in b/MAC/GCF/Protocols/configure.in
index 7553121fc93..eaec4bae18f 100644
--- a/MAC/GCF/Protocols/configure.in
+++ b/MAC/GCF/Protocols/configure.in
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl
 AC_INIT(src/DH_PIProtocol.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(GCFProtocols, 6.0, no-define)
+AM_INIT_AUTOMAKE(GCFProtocols, 6.1, no-define)
 
 dnl Initialize for LOFAR (may set compilers)
 lofar_INIT
diff --git a/MAC/GCF/Protocols/src/Makefile.am b/MAC/GCF/Protocols/src/Makefile.am
index 8a952372d2e..fea6a65fc3f 100644
--- a/MAC/GCF/Protocols/src/Makefile.am
+++ b/MAC/GCF/Protocols/src/Makefile.am
@@ -1,31 +1,30 @@
 pkgincludedir = $(includedir)/GCF/Protocols
-pkginclude_HEADERS = $(BUILT_SOURCES) \
+pkginclude_HEADERS = \
+	PI_Protocol.ph \
+	PA_Protocol.ph \
 	DH_PIProtocol.h 
 
 AUTOGEN = autogen
 SUFFIXES = .ph
-
 %.ph: %.prot
 	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
 
 DOCHDRS	= $(pkginclude_HEADERS)
     
-lib_LTLIBRARIES 	= libgcfpicepprot.la libgcfpirtcprot.la libgcfpaprot.la
+lib_LTLIBRARIES 	= libgcfpirtcprot.la libgcfpaprot.la libgcfpicepprot.la 
 
 libgcfpicepprot_la_SOURCES= $(DOCHDRS) \
   DH_PIProtocol.cc
 
-libgcfpirtcprot_la_SOURCES= $(DOCHDRS) \
+libgcfpirtcprot_la_SOURCES= $(DOCHDRS) \ 
   PI_Protocol.cc
 
 libgcfpaprot_la_SOURCES= $(DOCHDRS) \
   PA_Protocol.cc
 
-BUILT_SOURCES = \
-	PI_Protocol.ph \
-	PA_Protocol.ph
+BUILT_SOURCES = 
 
-EXTRA_DIST = $(BUILT_SOURCES) gcf-pi.conf.in
+EXTRA_DIST = PI_Protocol.prot PA_Protocol.prot $(sysconf_DATA)
 
 sysconf_DATA= \
 	PropertyInterface.conf
@@ -33,8 +32,5 @@ sysconf_DATA= \
 %.conf: gcf-pi.conf.in
 	cp $< $@
 
-clean-local:
-	rm -f *.ph
-
 include $(top_srcdir)/Makefile.common
 
diff --git a/MAC/GCF/TM/GCFTM.spec.in b/MAC/GCF/TM/GCFTM.spec.in
index e0cbe341117..897b72555fe 100644
--- a/MAC/GCF/TM/GCFTM.spec.in
+++ b/MAC/GCF/TM/GCFTM.spec.in
@@ -29,7 +29,7 @@ URL: http://www.astron.nl
 Prefix: %{prefix}
 BuildArchitectures: i386 # Target platforms, i.e., i586
 Requires: Common >= 2.2
-Requires: GCFCommon >= 6.0
+Requires: GCFCommon >= 6.1
 Packager: %{packager}
 Distribution: The LOFAR project
 Vendor: ASTRON
@@ -136,6 +136,11 @@ fi
 
 # link the module to the correct path
 %post 
+  f=%{prefix}/etc/ServiceBroker.conf;
+  hs=`hostname -s`;
+  h=`hostname`;
+  n=`sed -e  "/mac.gcf.sb.host=/ s/\(.*\)=\(.*\)/\1=$hs/" -e "/mac.gcf.sb.range1.host=/ s/\(.*\)=\(.*\)/\1=$h/" $f`;
+  echo "$n" > $f
 
 # before uninstall
 %preun
diff --git a/MAC/GCF/TM/configure.in b/MAC/GCF/TM/configure.in
index e10735cf971..eec7b22ecdb 100644
--- a/MAC/GCF/TM/configure.in
+++ b/MAC/GCF/TM/configure.in
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl
 AC_INIT(include/GCF/TM/GCF_Event.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(GCFTM, 6.0, no-define)
+AM_INIT_AUTOMAKE(GCFTM, 6.1, no-define)
 
 dnl Initialize for LOFAR (may set compilers)
 lofar_INIT
diff --git a/MAC/GCF/TM/src/Makefile.am b/MAC/GCF/TM/src/Makefile.am
index 7a231df48a9..216ab39a932 100644
--- a/MAC/GCF/TM/src/Makefile.am
+++ b/MAC/GCF/TM/src/Makefile.am
@@ -16,7 +16,8 @@ DOCHDRS = \
   PortImpl/GTM_ETHSocket.h \
   PortImpl/GTM_Device.h \
   ServiceBroker/GTM_SBTCPPort.h \
-  ServiceBroker/GTM_ServiceBroker.h
+  ServiceBroker/GTM_ServiceBroker.h \
+  SB_Protocol.ph
     
 lib_LTLIBRARIES 	= libgcftm.la
 
@@ -46,10 +47,9 @@ libgcftm_la_CPPFLAGS=-I$(top_srcdir)/src/ServiceBroker
 
 libgcftm_la_CXXFLAGS=-fmessage-length=0
 
-BUILT_SOURCES =  \
-	SB_Protocol.ph
+BUILT_SOURCES = 
 
-EXTRA_DIST = $(BUILT_SOURCES) mac.log_prop.in
+EXTRA_DIST = $(sysconf_DATA)
 	
 sysconf_DATA = \
 	mac.log_prop
@@ -57,8 +57,5 @@ sysconf_DATA = \
 %.log_prop: %.log_prop.in
 	cp $< $@
 
-clean-local:
-	rm -f *.ph
-	
 include $(top_srcdir)/Makefile.common
 
diff --git a/MAC/GCF/TM/src/ServiceBroker/Makefile.am b/MAC/GCF/TM/src/ServiceBroker/Makefile.am
index bc5dfa63074..a2514c2795e 100644
--- a/MAC/GCF/TM/src/ServiceBroker/Makefile.am
+++ b/MAC/GCF/TM/src/ServiceBroker/Makefile.am
@@ -22,14 +22,17 @@ ServiceBroker_CXXFLAGS=-fmessage-length=0
 
 BUILT_SOURCES = 
 
-EXTRA_DIST = $(BUILT_SOURCES) gcf-sb.conf.in
+EXTRA_DIST = SB_Protocol.prot $(sysconf_DATA)
 
 sysconf_DATA= \
 	ServiceBroker.conf
 
 install-data-local:
-	echo "mac.gcf.sb.host=`hostname -s`" >> $(DESTDIR)$(sysconfdir)/ServiceBroker.conf
-	echo "mac.gcf.sb.range1.host=`hostname`" >> $(DESTDIR)$(sysconfdir)/ServiceBroker.conf
+	f=$(DESTDIR)$(sysconfdir)/ServiceBroker.conf; \
+	hs=`hostname -s`; \
+	h=`hostname`; \
+	n=`sed -e  "/mac.gcf.sb.host=/ s/\(.*\)=\(.*\)/\1=$$hs/" -e "/mac.gcf.sb.range1.host=/ s/\(.*\)=\(.*\)/\1=$$h/" $$f`; \
+	echo "$$n" > $$f;
 	
 %.conf: gcf-sb.conf.in
 	cp $< $@
diff --git a/MAC/GCF/TM/src/ServiceBroker/gcf-sb.conf.in b/MAC/GCF/TM/src/ServiceBroker/gcf-sb.conf.in
index 67bc2fd7d87..0231ac6dc64 100644
--- a/MAC/GCF/TM/src/ServiceBroker/gcf-sb.conf.in
+++ b/MAC/GCF/TM/src/ServiceBroker/gcf-sb.conf.in
@@ -1,3 +1,5 @@
 mac.gcf.sb.port=24000
 mac.gcf.sb.range1.firstPortNumber=24001
 mac.gcf.sb.range1.lastPortNumber=25000
+mac.gcf.sb.host=
+mac.gcf.sb.range1.host=
diff --git a/MAC/GCF/TM/test/Makefile.am b/MAC/GCF/TM/test/Makefile.am
index 41c78fce38a..1e5c4375e39 100644
--- a/MAC/GCF/TM/test/Makefile.am
+++ b/MAC/GCF/TM/test/Makefile.am
@@ -1,24 +1,21 @@
 bin_PROGRAMS 		= tmEcho tmPing
 
-tmEcho_SOURCES 		= Echo.cc Echo_Protocol.cc Echo.h
+tmEcho_SOURCES 		= Echo_Protocol.ph Echo_Protocol.cc Echo.cc Echo.h 
 tmEcho_LDADD		= ../src/libgcftm.la
 tmEcho_DEPENDENCIES	= ../src/libgcftm.la $(LOFAR_DEPEND)
-tmEcho_CPPFLAGS=-I$(top_srcdir)/include
 
-tmPing_SOURCES 		= Ping.cc Echo_Protocol.cc Ping.h
+tmPing_SOURCES 		= Echo_Protocol.ph Echo_Protocol.cc Ping.cc Ping.h
 tmPing_LDADD		= ../src/libgcftm.la
 tmPing_DEPENDENCIES	= ../src/libgcftm.la $(LOFAR_DEPEND)
-tmPing_CPPFLAGS=-I$(top_srcdir)/include
 
 AUTOGEN = autogen
 SUFFIXES = .ph
 %.ph: %.prot
 	$(AUTOGEN) --writable -L $(top_srcdir)/autogen $<
 
-BUILT_SOURCES = \
-	Echo_Protocol.ph
+BUILT_SOURCES =
 
-EXTRA_DIST = $(BUILT_SOURCES) tm-test.conf.in
+EXTRA_DIST = Echo_Protocol.prot $(sysconf_DATA)
 
 sysconf_DATA=\
 	tmEcho.conf \
diff --git a/MAC/GCF/_PAL/GCFPAL.spec.in b/MAC/GCF/_PAL/GCFPAL.spec.in
index ec88658130b..78837052951 100644
--- a/MAC/GCF/_PAL/GCFPAL.spec.in
+++ b/MAC/GCF/_PAL/GCFPAL.spec.in
@@ -29,9 +29,9 @@ URL: http://www.astron.nl
 Prefix: %{prefix}
 BuildArchitectures: i386 # Target platforms, i.e., i586
 Requires: Common >= 2.2
-Requires: GCFCommon >= 6.0
-Requires: GCFTM >= 6.0
-Requires: GCFProtocols >= 6.0
+Requires: GCFCommon >= 6.1
+Requires: GCFTM >= 6.1
+Requires: GCFProtocols >= 6.1
 Requires: Transport >= 2.0
 Packager: %{packager}
 Distribution: The LOFAR project
diff --git a/MAC/GCF/_PAL/PA/src/Makefile.am b/MAC/GCF/_PAL/PA/src/Makefile.am
index eb2e50755ad..e49c6fdfda3 100644
--- a/MAC/GCF/_PAL/PA/src/Makefile.am
+++ b/MAC/GCF/_PAL/PA/src/Makefile.am
@@ -13,7 +13,6 @@ libpa_la_SOURCES= $(DOCHDRS) \
 	GPA_RequestManager.cc \
 	GPA_Converter.cc
 	
-#libpa_la_CPPFLAGS= -I$(top_srcdir)/SAL/src
 
 bin_PROGRAMS   		= PropertyAgent
   
@@ -24,8 +23,6 @@ PropertyAgent_LDADD		     			= libpa.la $(LOFAR_DEPEND) \
 PropertyAgent_DEPENDENCIES	= libpa.la $(LOFAR_DEPEND) \
 	$(top_builddir)/SAL/src/libsal.la
 	
-#PropertyAgent_CPPFLAGS= -I$(top_srcdir)/SAL/src
-
 AM_CPPFLAGS = -DLOFARLOGGER_SUBPACKAGE=\"PA\" -I$(top_srcdir)/SAL/src
 
 #in case of make install these files will be copied to the bindir beside the test apps
@@ -36,7 +33,7 @@ configfiles_DATA= \
 
 BUILT_SOURCES = 
 
-EXTRA_DIST = $(BUILT_SOURCES) $(configfiles_DATA) gcf-pa.conf.in 
+EXTRA_DIST = $(configfiles_DATA) $(sysconf_DATA) 
 
 sysconf_DATA= \
 	PropertyAgent.conf
diff --git a/MAC/GCF/_PAL/PML/src/Makefile.am b/MAC/GCF/_PAL/PML/src/Makefile.am
index 3bc5a63a163..e4bcd7948c7 100644
--- a/MAC/GCF/_PAL/PML/src/Makefile.am
+++ b/MAC/GCF/_PAL/PML/src/Makefile.am
@@ -33,7 +33,7 @@ AM_CPPFLAGS = -DLOFARLOGGER_SUBPACKAGE=\"PML\"
 	
 BUILT_SOURCES = 
 
-EXTRA_DIST = $(BUILT_SOURCES) gcf-pml.conf.in
+EXTRA_DIST = $(sysconf_DATA)
 
 sysconf_DATA= \
 	gcf-pml.conf
diff --git a/MAC/GCF/_PAL/SAL/test/Makefile.am b/MAC/GCF/_PAL/SAL/test/Makefile.am
index 5200b5dca06..0775fbece60 100644
--- a/MAC/GCF/_PAL/SAL/test/Makefile.am
+++ b/MAC/GCF/_PAL/SAL/test/Makefile.am
@@ -4,11 +4,11 @@ check_PROGRAMS 		= salEcho salPing
 
 TESTS			= #salEcho salPing
 
-salEcho_SOURCES 			= Echo.cc Service.cc Echo_Protocol.cc
+salEcho_SOURCES 			= Echo_Protocol.ph Echo.cc Service.cc Echo_Protocol.cc
 salEcho_LDADD					= ../src/libsal.la $(LOFAR_DEPEND)
 salEcho_DEPENDENCIES	= ../src/libsal.la $(LOFAR_DEPEND)
 
-salPing_SOURCES 					= Ping.cc  Echo_Protocol.cc
+salPing_SOURCES 					= Echo_Protocol.ph Ping.cc  Echo_Protocol.cc
 salPing_LDADD						=  ../src/libsal.la $(LOFAR_DEPEND)
 salPing_DEPENDENCIES			= ../src/libsal.la $(LOFAR_DEPEND)
 
@@ -17,10 +17,9 @@ SUFFIXES = .ph
 %.ph: %.prot
 	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
 
-BUILT_SOURCES = \
-	Echo_Protocol.ph
+BUILT_SOURCES = 
 
-EXTRA_DIST = $(BUILT_SOURCES) sal-test.conf.in
+EXTRA_DIST = Echo_Protocol.prot $(sysconf_DATA)
 
 sysconf_DATA= \
 	salEcho.conf \
@@ -29,9 +28,6 @@ sysconf_DATA= \
 %.conf: sal-test.conf.in
 	ln -sf $< $@
 
-clean-local:
-	rm -f *.ph
-
 include $(top_srcdir)/Makefile.common
 
 
diff --git a/MAC/GCF/_PAL/configure.in b/MAC/GCF/_PAL/configure.in
index fe058a7bffe..d874899e723 100644
--- a/MAC/GCF/_PAL/configure.in
+++ b/MAC/GCF/_PAL/configure.in
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl
 AC_INIT(include/GCF/PAL/GCF_Property.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(GCFPAL, 6.0, no-define)
+AM_INIT_AUTOMAKE(GCFPAL, 6.1, no-define)
 
 dnl Initialize for LOFAR (may set compilers)
 lofar_INIT
diff --git a/MAC/GCF/_PALlight/GCFPALlight.spec.in b/MAC/GCF/_PALlight/GCFPALlight.spec.in
index 955bf367093..8992d99a3ca 100644
--- a/MAC/GCF/_PALlight/GCFPALlight.spec.in
+++ b/MAC/GCF/_PALlight/GCFPALlight.spec.in
@@ -29,10 +29,10 @@ URL: http://www.astron.nl
 Prefix: %{prefix}
 BuildArchitectures: i386 # Target platforms, i.e., i586
 Requires: Common >= 2.2
-Requires: GCFCommon >= 6.0
-Requires: GCFTM >= 6.0
-Requires: GCFProtocols >= 6.0
-Requires: GCFPAL >= 6.0
+Requires: GCFCommon >= 6.1
+Requires: GCFTM >= 6.1
+Requires: GCFProtocols >= 6.1
+Requires: GCFPAL >= 6.1
 Requires: Transport >= 2.0
 Packager: %{packager}
 Distribution: The LOFAR project
diff --git a/MAC/GCF/_PALlight/PMLlight/src/Makefile.am b/MAC/GCF/_PALlight/PMLlight/src/Makefile.am
index 78c4804d5f3..fa3f0d1bcf1 100644
--- a/MAC/GCF/_PALlight/PMLlight/src/Makefile.am
+++ b/MAC/GCF/_PALlight/PMLlight/src/Makefile.am
@@ -19,7 +19,7 @@ libgcfpallight_la_DEPENDENCIES= libpmllight.la $(LOFAR_DEPEND)
 
 AM_CPPFLAGS = -DLOFARLOGGER_SUBPACKAGE=\"RTC\"
 
-EXTRA_DIST= $(configfiles_DATA) gcf-pmllight.conf.in
+EXTRA_DIST= $(configfiles_DATA) $(sysconf_DATA)
 
 sysconf_DATA= \
 	gcf-pmllight.conf
diff --git a/MAC/GCF/_PALlight/configure.in b/MAC/GCF/_PALlight/configure.in
index 47c0f07efeb..77d9e52a436 100644
--- a/MAC/GCF/_PALlight/configure.in
+++ b/MAC/GCF/_PALlight/configure.in
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl
 AC_INIT(include/GCF/PALlight/GCF_RTMyProperty.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(GCFPALlight, 6.0, no-define)
+AM_INIT_AUTOMAKE(GCFPALlight, 6.1, no-define)
 
 dnl Initialize for LOFAR (may set compilers)
 lofar_INIT
-- 
GitLab