# Note: Makefile is built automatically from Makefile.in
#
-# $Id: Makefile.in,v 1.10 2001/06/07 17:27:45 swa Exp $
+# $Id: Makefile.in,v 1.11 2001/06/11 11:26:35 sarantis Exp $
#
# Written by and Copyright (C) 2001 the SourceForge
# IJBSWA team. http://ijbswa.sourceforge.net
# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# $Log: Makefile.in,v $
+# Revision 1.11 2001/06/11 11:26:35 sarantis
+# RPM version should be the same as ijbswa version. The rpm release is
+# specified in the specfile.
+#
# Revision 1.10 2001/06/07 17:27:45 swa
# added suse build section
#
VERSION_MINOR = @VERSION_MINOR@
VERSION_POINT = @VERSION_POINT@
VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_POINT)
+# will automatically be postfixed with -$(RPM_PACKAGEV) in the SPECfile
RPM_VERSION = $(VERSION)
+RPM_PACKAGEV = 1
# The version is currently specified in config.h, which is
# written by "configure".
PROGRAM = junkbuster@EXEEXT@
CC = gcc
ECHO = echo
-GZIP = gzip
+GZIP_PROG = gzip
INSTALL = cp -f
LD = gcc
OBJEXT = @OBJEXT@
RM = rm -f
-STRIP = strip
+STRIP_PROG = strip
C_SRC = actions.c encode.c errlog.c filters.c gateway.c jbsockets.c \
jcc.c killpopup.c list.c loadcfg.c loaders.c miscutil.c \
@make clobber
# verify that i'm root needs to be done
rm -f ../ijbswa.tar.gz
- tar --exclude "junkbuster-suse.spec" -cvzf ../ijbswa.tar.gz .
# verify all version strings, FLAGS, etc. in the spec file
-# cat junkbuster-rh.spec | sed 's/^Version:.*/Version: $(RPM_VERSION)/g' | sed 's/^Release:.*/Release: $(VERSION_POINT)/g' > /tmp/abc && cp -f /tmp/abc junkbuster-rh.spec
+ cat junkbuster-rh.spec | sed 's/^Version:.*/Version: $(RPM_VERSION)/g' | sed 's/^Release:.*/Release: $(RPM_PACKAGEV)/g' > /tmp/abc && cp -f /tmp/abc junkbuster-rh.spec
+ tar --exclude "CVS" --exclude "junkbuster-suse.spec" -cvzf ../ijbswa.tar.gz .
# verify all files in their correct location needs to be done
cd .. && rpm -ta ijbswa.tar.gz
@make clobber
# verify that i'm root needs to be done
rm -f ../ijbswa.tar.gz
- tar --exclude "junkbuster-rh.spec" -cvzf ../ijbswa.tar.gz .
# verify all version strings, FLAGS, etc. in the spec file
- cat junkbuster-suse.spec | sed 's/^Version:.*/Version: $(RPM_VERSION)/g' | sed 's/^Release:.*/Release: $(VERSION_POINT)/g' > /tmp/abc && cp -f /tmp/abc junkbuster-suse.spec
+ cat junkbuster-suse.spec | sed 's/^Version:.*/Version: $(RPM_VERSION)/g' | sed 's/^Release:.*/Release: $(RPM_PACKAGEV)/g' > /tmp/abc && cp -f /tmp/abc junkbuster-suse.spec
+ tar --exclude "CVS" --exclude "junkbuster-rh.spec" -cvzf ../ijbswa.tar.gz .
# verify all files in their correct location needs to be done
cd .. && rpm -ta ijbswa.tar.gz
etags $(SRCS) $(HDRS)
install: all
- $(STRIP) $(PROGRAM)
+ $(STRIP_PROG) $(PROGRAM)
$(INSTALL) $(PROGRAM) $(SBIN_DEST)
$(INSTALL) README README.TOO README.WIN README.re_filter README.cygwin $(DEST)
$(INSTALL) aclfile blocklist config cookiefile forward imagelist \
popup re_filterfile trust $(DEST)
# FIXME: On SuSE, these are not found. Where do they go?
$(ECHO) junkbuster.logrotate junkbuster.monthly junkbuster.weekly
- $(GZIP) -c junkbuster.1 > $(MAN_DEST)/junkbuster.1.gz
+ $(GZIP_PROG) -c junkbuster.1 > $(MAN_DEST)/junkbuster.1.gz
$(INSTALL) junkbuster.init /sbin/init.d/junkbuster
-# $Id: junkbuster-rh.spec,v 1.6 2001/06/11 11:28:25 sarantis Exp $
+# $Id: junkbuster-rh.spec,v 1.7 2001/06/11 12:17:26 sarantis Exp $
#
# Written by and Copyright (C) 2001 the SourceForge
# IJBSWA team. http://ijbswa.sourceforge.net
# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# $Log: junkbuster-rh.spec,v $
+# Revision 1.7 2001/06/11 12:17:26 sarantis
+# fix typo in %post
+#
# Revision 1.6 2001/06/11 11:28:25 sarantis
# Further optimizations and adaptations in the spec file.
#
%define ijbconf %{_sysconfdir}/junkbuster
%prep
-%setup -c -n %{name}-%{version}-%{release}
+%setup -c -n ijbswa
+
%build
-%configure
+./configure
make
strip junkbuster
cp -f templates/default $RPM_BUILD_ROOT%{ijbconf}/templates/
cp -f templates/show-status $RPM_BUILD_ROOT%{ijbconf}/templates/
cp -f templates/show-status-file $RPM_BUILD_ROOT%{ijbconf}/templates/
-cp -f junkbuster.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/junkbuster
-install -m 755 junkbuster.init $RPM_BUILD_ROOT/etc/rc.d/init.d/junkbuster
+cp -f junkbuster.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/junkbuster
+install -m 755 junkbuster.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/junkbuster
install -m 744 -d $RPM_BUILD_ROOT/var/log/junkbuster
# verify all file locations, etc. in the config file
# sed 's/^forward.*/forward \/etc\/junkbuster\/forward/g' | \
# sed 's/^aclfile.*/aclfile \/etc\/junkbuster\/aclfile/g' > \
sed 's/^logdir.*/logdir \/var\/log\/junkbuster/g' > \
- $RPM_BUILD_ROOT/etc/junkbuster/config
+ $RPM_BUILD_ROOT%{ijbconf}/config
%post
if [ "$1" = "1" ]; then
%config %{_sysconfdir}/logrotate.d/junkbuster
%attr(0744,junkbust,junkbust)/usr/sbin/junkbuster
%{_mandir}/man8/*
-%config /etc/rc.d/init.d/junkbuster
+%config %{_sysconfdir}/rc.d/init.d/junkbuster
%changelog