[svn] commit: r3171 - in /trunk: ./ ChangeLog configure.ac src/bin/xfrin/Makefile.am src/bin/xfrin/xfrin.spec src/bin/xfrin/xfrin.spec.pre.in

[BIND 10 source code commits]

Author: zhanglikun
Date: Mon Oct 11 07:20:09 2010
New Revision: 3171

Log:
Remove the parameter 'db_file' for command 'retransfer' of xfrin module, and xfrin.spec will not be generated by script.

Added:
    trunk/src/bin/xfrin/xfrin.spec
Removed:
    trunk/src/bin/xfrin/xfrin.spec.pre.in
Modified:
    trunk/   (props changed)
    trunk/ChangeLog
    trunk/configure.ac
    trunk/src/bin/xfrin/Makefile.am

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Mon Oct 11 07:20:09 2010
@@ -1,7 +1,12 @@
+  107.  [func]       zhang likun
+	Remove the parameter 'db_file' for command 'retransfer' of 
+	xfrin module. xfrin.spec will not be generated by script.
+	(Trac #329, r3171)	
+
   106.  [bug]       zhang likun
 	When xfrin can't connect with one zone's master, it should tell
 	the bad news to zonemgr, so that zonemgr can reset the timer for
-	that zone. (Trac #329, r3169)
+	that zone. (Trac #329, r3170)
 
   105.  [bug]       Michal Vaner
 	Python processes: they no longer take 100% CPU while idle

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Oct 11 07:20:09 2010
@@ -515,7 +515,6 @@
            src/bin/cmdctl/cmdctl.spec.pre
            src/bin/xfrin/tests/xfrin_test
            src/bin/xfrin/xfrin.py
-           src/bin/xfrin/xfrin.spec.pre
            src/bin/xfrin/run_b10-xfrin.sh
            src/bin/xfrout/xfrout.py
            src/bin/xfrout/xfrout.spec.pre

Modified: trunk/src/bin/xfrin/Makefile.am
==============================================================================
--- trunk/src/bin/xfrin/Makefile.am (original)
+++ trunk/src/bin/xfrin/Makefile.am Mon Oct 11 07:20:09 2010
@@ -7,10 +7,11 @@
 b10_xfrindir = $(DESTDIR)$(pkgdatadir)
 b10_xfrin_DATA = xfrin.spec
 
-CLEANFILES = b10-xfrin xfrin.pyc xfrin.spec
+CLEANFILES = b10-xfrin xfrin.pyc 
 
 man_MANS = b10-xfrin.8
 EXTRA_DIST = $(man_MANS) b10-xfrin.xml
+EXTRA_DIST += xfrin.spec
 
 if ENABLE_MAN
 
@@ -19,9 +20,6 @@
 
 endif
 
-xfrin.spec: xfrin.spec.pre
-	$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrin.spec.pre >$@
-
 # TODO: does this need $$(DESTDIR) also?
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
 b10-xfrin: xfrin.py