man page is legacy. suse rpm now contains html

documentation.

diff --git a/junkbuster-rh.spec b/junkbuster-rh.spec
index e5d80f1..796c4d8 100644 (file)
--- a/junkbuster-rh.spec
+++ b/junkbuster-rh.spec
@@ -1,4 +1,4 @@
-# $Id: junkbuster-rh.spec,v 1.12 2001/09/10 16:25:04 swa Exp $
+# $Id: junkbuster-rh.spec,v 1.13 2001/09/10 17:44:43 swa Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # IJBSWA team.  http://ijbswa.sourceforge.net
@@ -26,6 +26,10 @@
 # Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # $Log: junkbuster-rh.spec,v $
+# Revision 1.13  2001/09/10 17:44:43  swa
+# integrate three pieces of documentation. needs work.
+# will not build cleanly under redhat.
+#
 # Revision 1.12  2001/09/10 16:25:04  swa
 # copy all templates. version updated.
 #
@@ -86,10 +90,10 @@ Prereq: /usr/sbin/useradd , /sbin/chkconfig , /sbin/service
 Conflicts: junkbuster-raw junkbuster-blank
 
 %description
-The Internet Junkbuster stops your browser from displaying the
-advertisement images that pervade many commercial web pages.  Since
-your browser has to download fewer images, surfing the web should be
-faster.
+The Internet Junkbuster is an application that provides privacy and
+security to the user of the world wide web. It controls cookies,
+removes advertisements or pop-up windows. You can actually modify the
+content of web pages on-the-fly.
 
 %define ijbconf %{_sysconfdir}/junkbuster
 
@@ -114,7 +118,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} \
          ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
 
 install -s -m 744 junkbuster $RPM_BUILD_ROOT%{_sbindir}/junkbuster
-cp -f junkbuster.1 $RPM_BUILD_ROOT%{_mandir}/man8/junkbuster.8
+# cp -f junkbuster.1 $RPM_BUILD_ROOT%{_mandir}/man8/junkbuster.8
 cp -f actionsfile $RPM_BUILD_ROOT%{ijbconf}/actionsfile
 cp -f re_filterfile $RPM_BUILD_ROOT%{ijbconf}/re_filterfile
 cp -f trust $RPM_BUILD_ROOT%{ijbconf}/trust
@@ -164,7 +168,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0744,junkbust,junkbust) %dir /var/log/junkbuster
 %config %{_sysconfdir}/logrotate.d/junkbuster
 %attr(0744,junkbust,junkbust)/usr/sbin/junkbuster
-%{_mandir}/man8/*
+# %{_mandir}/man8/*
 %config %{_sysconfdir}/rc.d/init.d/junkbuster
 
 

diff --git a/junkbuster-suse.spec b/junkbuster-suse.spec
index 6e2287a..fa6ae52 100644 (file)
--- a/junkbuster-suse.spec
+++ b/junkbuster-suse.spec
@@ -1,4 +1,4 @@
-# $Id: junkbuster-suse.spec,v 1.6 2001/09/10 16:29:23 swa Exp $
+# $Id: junkbuster-suse.spec,v 1.7 2001/09/10 17:44:22 swa Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # IJBSWA team.  http://ijbswa.sourceforge.net
@@ -26,6 +26,9 @@
 # Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # $Log: junkbuster-suse.spec,v $
+# Revision 1.7  2001/09/10 17:44:22  swa
+# integrate three pieces of documentation.
+#
 # Revision 1.6  2001/09/10 16:29:23  swa
 # binary contained debug info.
 # buildroot definition fucks up the build process under suse.
@@ -70,10 +73,10 @@ Source:  http://www.waldherr.org/junkbuster/ijbswa.tar.gz
 # -----------------------------------------------------------------------------
 #
 %description
-The Internet Junkbuster stops your browser from displaying the
-advertisement images that pervade many commercial web pages.  Since
-your browser has to download fewer images, surfing the web should be
-faster.
+The Internet Junkbuster is an application that provides privacy and
+security to the user of the world wide web. It controls cookies,
+removes advertisements or pop-up windows. You can actually modify the
+content of web pages on-the-fly.
 
 Authors:
 --------
@@ -100,7 +103,7 @@ strip junkbuster
 #
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/{var/log/junkbuster,usr/{sbin,share/man/man1,share/doc/packages/junkbuster},etc/{junkbuster,junkbuster/templates,init.d}}
+mkdir -p $RPM_BUILD_ROOT/{var/log/junkbuster,usr/{sbin,share/man/man1,share/doc/packages/junkbuster,share/doc/packages/junkbuster/user-manual,share/doc/packages/junkbuster/developer-manual,share/doc/packages/junkbuster/faq},etc/{junkbuster,junkbuster/templates,init.d}}
 
 # make sure that we can write in the log directory
 chown nobody.nogroup $RPM_BUILD_ROOT/var/log/junkbuster
@@ -130,10 +133,10 @@ install -m 644 config $RPM_BUILD_ROOT/etc/junkbuster
 #install -m 644 forward $RPM_BUILD_ROOT/etc/junkbuster
 install -m 644 trust $RPM_BUILD_ROOT/etc/junkbuster
 install -m 644 templates/* $RPM_BUILD_ROOT/etc/junkbuster/templates
-install -m 644 junkbuster.1 $RPM_BUILD_ROOT/usr/share/man/man1
-install -m 644 doc/webserver/user-manual.html $RPM_BUILD_ROOT/usr/share/doc/packages/junkbuster
-install -m 644 doc/webserver/developer-manual.html $RPM_BUILD_ROOT/usr/share/doc/packages/junkbuster
-install -m 644 doc/webserver/faq.html $RPM_BUILD_ROOT/usr/share/doc/packages/junkbuster
+# install -m 644 junkbuster.1 $RPM_BUILD_ROOT/usr/share/man/man1
+cp -r doc/webserver/user-manual $RPM_BUILD_ROOT/usr/share/doc/packages/junkbuster
+cp -r doc/webserver/developer-manual $RPM_BUILD_ROOT/usr/share/doc/packages/junkbuster
+cp -r doc/webserver/faq $RPM_BUILD_ROOT/usr/share/doc/packages/junkbuster
 %{?suse_check}
 
 #
@@ -152,11 +155,11 @@ sbin/insserv etc/init.d/
 # -----------------------------------------------------------------------------
 #
 %files
-%doc /usr/share/doc/packages/junkbuster/faq.html
-%doc /usr/share/doc/packages/junkbuster/user-manual.html
-%doc /usr/share/doc/packages/junkbuster/developer-manual.html
+%doc /usr/share/doc/packages/junkbuster/faq/
+%doc /usr/share/doc/packages/junkbuster/user-manual/
+%doc /usr/share/doc/packages/junkbuster/developer-manual/
 /usr/sbin/junkbuster
-/usr/share/man/man1/junkbuster.1.gz
+#/usr/share/man/man1/junkbuster.1.gz
 %config(noreplace) /etc/junkbuster
 /etc/init.d/junkbuster
 /usr/sbin/rcjunkbuster