http://track.sipfoundry.org/browse/XCF-2685
I have been working on XCF-2685, which is to have sipXconfig generate
the configuration file for sipXrls instead of sipXrls itself. I have
sipXconfig properly generating the sipXrls configuration file, but I am
not as sure about my changes to the Makefile.am, sipxrls.sh.in, and the
.spec files. Since I am getting build errors when running 'make rpm'
(see my previous post), I can't be sure that I have done everything right.
So - to those of you who are more knowledgeable about such things, I
have attached a patch of the changes I made to these files. Could
someone give them a sanity check to make sure I didn't do anything wrong?
The changes that necessitated this are:
* Added new directory sipXconfig/neoconf/etc/sipxrls
* Added new files under sipXconfig/neoconf/etc/sipxrls
* Removing sipxrls-config.in.in
And since the configuration is now being generated by sipXconfig, I am
removing anything from Makefile.am and sipxrls.sh.in that performs
processing of the sipxrls-config configuration file.
>From 9250aa333cfdabcca3386bc4faca73a6b0a16b2f Mon Sep 17 00:00:00 2001
From: Joe Attardi <[EMAIL PROTECTED]>
Date: Thu, 21 Aug 2008 11:15:40 -0400
Subject: [PATCH] XCF-2785: removed references to sipxrls-config.in and added references to new .vm and settings xml
---
sipXconfig/sipxconfig.spec.in | 2 ++
sipXpbx/sipXrls/bin/sipxrls.sh.in | 19 -------------------
sipXpbx/sipXrls/etc/Makefile.am | 19 -------------------
sipXpbx/sipXrls/sipxrls.spec.in | 2 +-
sipXpbx/sipxpbx.spec.in | 2 +-
5 files changed, 4 insertions(+), 40 deletions(-)
diff --git a/sipXconfig/sipxconfig.spec.in b/sipXconfig/sipxconfig.spec.in
index 17ad8e5..8fb4baf 100644
--- a/sipXconfig/sipxconfig.spec.in
+++ b/sipXconfig/sipxconfig.spec.in
@@ -300,6 +300,8 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{sipxpbxconf}/sipxpresence/sipxpresence.xml
%dir %{sipxpbxconf}/sipxpark
%config(noreplace) %{sipxpbxconf}/sipxpark/*
+%dir %{sipxpbxconf}/sipxrls
+%config(noreplace) %{sipxpbxconf}/sipxrls/*
%dir %{sipxpbxconf}/sipxvxml
%config(noreplace) %{sipxpbxconf}/sipxvxml/*
%config(noreplace) %{sipxpbxconf}/test.d/*
diff --git a/sipXpbx/sipXrls/bin/sipxrls.sh.in b/sipXpbx/sipXrls/bin/sipxrls.sh.in
index 68dfb30..5bd1355 100644
--- a/sipXpbx/sipXrls/bin/sipxrls.sh.in
+++ b/sipXpbx/sipXrls/bin/sipxrls.sh.in
@@ -27,25 +27,6 @@ do
shift # always consume 1
done
-CONFIG_DEFS="@SIPX_CONFDIR@/config.defs"
-
-CONFIG_FILES="\
- @SIPX_CONFDIR@/sipxrls-config \
- "
-
-# If the "config.defs" file exists and the <name>.in file exists for a
-# configuration file, then run the config preprocessor to generate the
-# fully resolved configuration file.
-if [ -f "$CONFIG_DEFS" ]
-then
- for i in $CONFIG_FILES ; do
- if [ -f "${i}.in" ]
- then
- @bindir@/configpp --defs "${CONFIG_DEFS}" --in "${i}.in" --out "$i"
- fi
- done
-fi
-
[EMAIL PROTECTED]@/sipxrls.pid
case ${Action} in
diff --git a/sipXpbx/sipXrls/etc/Makefile.am b/sipXpbx/sipXrls/etc/Makefile.am
index 5e82565..6faaaee 100644
--- a/sipXpbx/sipXrls/etc/Makefile.am
+++ b/sipXpbx/sipXrls/etc/Makefile.am
@@ -4,13 +4,11 @@ SIPX_PROCESS_DEFS = \
sipxrls
EXTRA_DIST = \
- sipxrls-config.in.in \
sipxrls-process.xml.in \
sipxrls.process.xml.in
install-data-hook : \
$(DESTDIR)$(SIPX_CONFDIR)/process.d/sipxrls.process.xml \
- $(DESTDIR)$(SIPX_CONFDIR)/sipxrls-config.in
sipxrls.process.xml.local : $(srcdir)/sipxrls.process.xml.in
@echo "Localize $< -> $@"
@@ -28,20 +26,3 @@ $(DESTDIR)$(SIPX_CONFDIR)/process.d/sipxrls.process.xml: sipxrls.process.xml.loc
); \
fi
-sipxrls-config.in.local : $(srcdir)/sipxrls-config.in.in
- @echo "Localize $< -> $@"
- @$(LocalizeSipXconfig) $< > $@
-
-$(DESTDIR)$(SIPX_CONFDIR)/sipxrls-config.in : sipxrls-config.in.local
- @if ! test -f $@; \
- then \
- echo "Installing default $@"; \
- $(INSTALL) -D -m 644 $< $@; \
- else \
- diff $< @ > /dev/null 2>&1 \
- || ( echo "Using existing $@ - new file is [EMAIL PROTECTED]" \
- ; $(INSTALL) -D -m 644 $< [EMAIL PROTECTED]; \
- ); \
- fi
-
-
diff --git a/sipXpbx/sipXrls/sipxrls.spec.in b/sipXpbx/sipXrls/sipxrls.spec.in
index 2132106..8afb238 100644
--- a/sipXpbx/sipXrls/sipxrls.spec.in
+++ b/sipXpbx/sipXrls/sipxrls.spec.in
@@ -68,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT
# The configuration directory needs to be writeable because
# config files are generated from templates via config.defs
%dir %attr(755,@SIPXPBXUSER@,@SIPXPBXUSER@) %{_sysconfdir}/sipxpbx
-%config(noreplace) %attr(644,@SIPXPBXUSER@,@SIPXPBXUSER@) %{_sysconfdir}/sipxpbx/sipxrls-config.in
+#%config(noreplace) %attr(644,@SIPXPBXUSER@,@SIPXPBXUSER@) %{_sysconfdir}/sipxpbx/sipxrls-config.in
%config(noreplace) %attr(644,@SIPXPBXUSER@,@SIPXPBXUSER@) %{_sysconfdir}/sipxpbx/process.d/sipxrls.process.xml
%files devel
diff --git a/sipXpbx/sipxpbx.spec.in b/sipXpbx/sipxpbx.spec.in
index 5daeb2e..9e1244c 100644
--- a/sipXpbx/sipxpbx.spec.in
+++ b/sipXpbx/sipxpbx.spec.in
@@ -173,7 +173,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/sipxrls
%attr(755,root,root) %{_bindir}/sipxrls-config
-%config(noreplace) %attr(644,@SIPXPBXUSER@,@SIPXPBXGROUP@) %{_sysconfdir}/sipxpbx/sipxrls-config.in
+#%config(noreplace) %attr(644,@SIPXPBXUSER@,@SIPXPBXGROUP@) %{_sysconfdir}/sipxpbx/sipxrls-config.in
%attr(755,root,root) %{_datadir}/sipxecs/schema/resource-lists.xsd
--
1.5.4.1
_______________________________________________
sipx-dev mailing list
[email protected]
List Archive: http://list.sipfoundry.org/archive/sipx-dev
Unsubscribe: http://list.sipfoundry.org/mailman/listinfo/sipx-dev
