X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=junkbuster-rh.spec;h=e17a594caa7c9115a0580dfc883a3f04f3628b44;hb=bc46dec9d845571191c3b2bb1fad6e47b97ba171;hp=e36423aa107744c8245e529086c818eed9d880e8;hpb=f391551f4e6db58346b9bb24883e4da11bec775d;p=privoxy.git

diff --git a/junkbuster-rh.spec b/junkbuster-rh.spec
index e36423aa..e17a594c 100644
--- a/junkbuster-rh.spec
+++ b/junkbuster-rh.spec
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.7 2001/06/03 17:09:09 swa Exp $
+# $Id: junkbuster-rh.spec,v 1.1 2001/06/04 10:44:57 swa Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # IJBSWA team.  http://ijbswa.sourceforge.net
@@ -25,7 +25,11 @@
 # or write to the Free Software Foundation, Inc., 59
 # Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
-# $Log: Makefile.in,v $
+# $Log: junkbuster-rh.spec,v $
+# Revision 1.1  2001/06/04 10:44:57  swa
+# `make redhatr-dist' now works. Except for the paths
+# in the config file.
+#
 #
 #
 %define PACKAGE_NAME junkbuster
@@ -255,7 +259,20 @@ cp -f re_filterfile $RPM_BUILD_ROOT/etc/junkbuster/re_filterfile
 # cp -f imagelist $RPM_BUILD_ROOT/etc/junkbuster/imagelist
 # cp -f cookiefile $RPM_BUILD_ROOT/etc/junkbuster/cookiefile
 cp -f aclfile $RPM_BUILD_ROOT/etc/junkbuster/aclfile
-cp -f config $RPM_BUILD_ROOT/etc/junkbuster/config
+
+# verify all file locations, etc. in the config file
+# don't start with ^ or commented lines are not replaced
+cat config | \
+    sed 's/^confdir.*/confdir \/etc\/junkbuster/g' | \
+#    sed 's/^permissionsfile.*/permissionsfile \/etc\/junkbuster\/permissionsfile/g' | \
+#    sed 's/^re_filterfile.*/re_filterfile \/etc\/junkbuster\/re_filterfile/g' | \
+#    sed 's/^logfile.*/logfile \/var\/log\/junkbuster\/logfile/g' | \
+#    sed 's/^jarfile.*/jarfile \/var\/log\/junkbuster\/jarfile/g' | \
+#    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
+
 cp -f forward $RPM_BUILD_ROOT/etc/junkbuster/forward
 cp -f trust $RPM_BUILD_ROOT/etc/junkbuster/trust
 # cp -f popup $RPM_BUILD_ROOT/etc/junkbuster/popup