Renaming config files

diff --git a/GNUmakefile.in b/GNUmakefile.in
index d10e0b1..edeacfc 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.18 2002/03/21 23:00:00 swa Exp $
+# $Id: GNUmakefile.in,v 1.19 2002/03/22 20:53:03 morcego Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # IJBSWA team.  http://ijbswa.sourceforge.net
@@ -28,6 +28,53 @@
 # Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # $Log: GNUmakefile.in,v $
+# Revision 1.19  2002/03/22 20:53:03  morcego
+# - Ongoing process to change name to JunkbusterNG
+# - configure/configure.in: no change needed
+# - GNUmakefile.in:
+#         - TAR_ARCH = /tmp/JunkbusterNG-$(RPM_VERSION).tar.gz
+#         - PROGRAM    = jbng@EXEEXT@
+#         - rh-spec now references as junkbusterng-rh.spec
+#         - redhat-upload: references changed to junkbusterng-* (package names)
+#         - tarball-dist: references changed to JunkbusterNG-distribution-*
+#         - tarball-src: now JunkbusterNG-*
+#         - install: initscript now junkbusterng.init and junkbusterng (when
+#                    installed)
+# - junkbuster-rh.spec: renamed to junkbusterng-rh.spec
+# - junkbusterng.spec:
+#         - References to the expression ijb where changed where possible
+#         - New package name: junkbusterng (all in lower case, acording to
+#           the LSB recomendation)
+#         - Version changed to: 2.9.13
+#         - Release: 1
+#         - Added: junkbuster to obsoletes and conflicts (Not sure this is
+#           right. If it obsoletes, why conflict ? Have to check it later)
+#         - Summary changed: Stefan, please check and aprove it
+#         - Changes description to use the new name
+#         - Sed string was NOT changed. Have to wait to the manpage to
+#           change first
+#         - Keeping the user junkbuster for now. It will require some aditional
+#           changes on the script (scheduled for the next specfile release)
+#         - Added post entry to move the old logfile to the new log directory
+#         - Removing "chkconfig --add" entry (not good to have it automaticaly
+#           added to the startup list).
+#         - Added preun section to stop the service with the old name, as well
+#           as remove it from the startup list
+#         - Removed the chkconfig --del entry from the conditional block on
+#           the preun scriptlet (now handled on the %files section)
+# - junkbuster.init: renamed to junkbusterng.init
+# - junkbusterng.init:
+#         - Changed JB_BIN to jbng
+#         - Created JB_OBIN with the old value of JB_BIN (junkbuster), to
+#           be used where necessary (config dir)
+#
+# Aditional notes:
+# - The config directory is /etc/junkbuster yet. Have to change it on the
+# specfile, after it is changes on the code
+# - The only files that got renamed on the cvs tree were the rh specfile and
+# the init file. Some file references got changes on the makefile and on the
+# rh-spec (as listed above)
+#
 # Revision 1.18  2002/03/21 23:00:00  swa
 # want to autogenerate stuff.
 #
@@ -334,7 +381,7 @@ W32_FILES = @WIN_ONLY@w32.res
 W32_OBJS  = @WIN_ONLY@$(W32_SRC:.c=.@OBJEXT@) $(W32_FILES)
 W32_HDRS  = @WIN_ONLY@w32log.h w32taskbar.h win32.h w32res.h
 W32_LIB   = @WIN_ONLY@-lwsock32 -lcomctl32
-W32_INIS  = @WIN_ONLY@config.txt trust.txt re_filterfile.txt
+W32_INIS  = @WIN_ONLY@config.txt trust.txt
 
 PCRS_SRC     = @STATIC_PCRS_ONLY@pcrs.c
 PCRS_OBJS    = @STATIC_PCRS_ONLY@$(PCRS_SRC:.c=.@OBJEXT@)
@@ -422,12 +469,13 @@ config.txt: config
        $(SED) -e 's!\trustfile trust!trustfile trust.txt!' \
               -e 's!\jarfile jarfile!jarfile jar.log!' \
               -e 's!\logfile logfile!logfile junkbuster.log!' \
-              -e 's!\re_filterfile re_filterfile!re_filterfile re_filterfile.txt!' \
               -e 's!#Win32-only: !!' \
               < $< | \
               $(DOSFILTER) > $@
-       # LF to CRLF in ijb.action
-       $(DOSFILTER) <ijb.action >ijb.action.txt && mv ijb.action.txt ijb.action
+       # LF to CRLF in default.action
+       $(DOSFILTER) <default.action >default.action.txt && mv default.action.txt default.action
+       # LF to CRLF in default.filter
+       $(DOSFILTER) <default.filter >default.filter.txt && mv default.filter.txt default.filter
 
 trust.txt: trust
        $(DOSFILTER) < $< > $@ 
@@ -720,7 +768,7 @@ install: all
        mkdir -p $(DEST)/templates
        cp -r doc/webserver/user-manual $(DEST)
        cp -r templates $(DEST)
-       $(INSTALL) config ijb.action re_filterfile trust $(DEST)
+       $(INSTALL) config default.action default.filter trust $(DEST)
        # FIXME $(ECHO) junkbuster.logrotate junkbuster.monthly junkbuster.weekly
        # FIXME: Need new manual! $(GZIP_PROG) -c junkbuster.1 > $(MAN_DEST)/junkbuster.1.gz
        $(INSTALL) junkbusterng.init /etc/init.d/junkbusterng