don't error in spec file and set a version on trunk (FSBUILD-48)

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8871 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/configure.in b/configure.in
index fa9fe7a038bb2d88e00ffe62d8b3ecce14392365..4cd0cf0a7eeefe49f14c386688c5837965755a13 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@
 AC_INIT([freeswitch], [1.0.pre4], BUG-REPORT-ADDRESS)
 AC_SUBST(SWITCH_VERSION_MAJOR, [1])
 AC_SUBST(SWITCH_VERSION_MINOR, [0])
-AC_SUBST(SWITCH_VERSION_MICRO, [pre4])
+AC_SUBST(SWITCH_VERSION_MICRO, [trunk])
 #AC_SUBST(SWITCH_VERSION_REVISION, [svn-revision-here])
 AC_SUBST(SOUNDS_VERSION, [1.0.2])
 

diff --git a/freeswitch.spec b/freeswitch.spec
index 911a0817970947ca9ae744c8d5a69e33de679d85..2be6f63da0dda6e4023f511201bb2a7c91c4c61a 100644 (file)
--- a/freeswitch.spec
+++ b/freeswitch.spec
@@ -172,7 +172,7 @@ XML_INT_MODULES="xml_int/mod_xml_rpc  xml_int/mod_xml_curl xml_int/mod_xml_cdr"
 MYMODULES="$PASSTHRU_CODEC_MODULES $SPIDERMONKEY_MODULES $APPLICATIONS_MODULES $ASR_TTS_MODULES $CODECS_MODULES $DIALPLANS_MODULES $DIRECTORIES_MODULES $DOTNET_MODULES $ENDPOINTS_MODULES $EVENT_HANDLERS_MODULES $FORMATS_MODULES $LANGUAGES_MODULES $LOGGERS_MODULES $SAY_MODULES $TIMERS_MODULES $XML_INT_MODULES"
 
 export MODULES=$MYMODULES
-rm -f modules.conf
+test ! -f  modules.conf || rm -f modules.conf
 touch modules.conf
 for i in $MODULES; do echo $i >> modules.conf; done
 export VERBOSE=yes