SPECS: backuppc.spec - killed idiotic code

[glen]

Author: glen                         Date: Sun Apr 16 20:23:31 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- killed idiotic code

---- Files affected:
SPECS:
   backuppc.spec (1.61 -> 1.62) 

---- Diffs:

================================================================
Index: SPECS/backuppc.spec
diff -u SPECS/backuppc.spec:1.61 SPECS/backuppc.spec:1.62
--- SPECS/backuppc.spec:1.61	Sun Apr 16 22:18:47 2006
+++ SPECS/backuppc.spec	Sun Apr 16 22:23:26 2006
@@ -117,20 +117,17 @@
 %patch1 -p1
 %patch2 -p1
 
-%build
 sed -i -e 's#!/bin/perl#!%{__perl}#' configure.pl
 sed -i -e 's#!/bin/perl#!%{__perl}#' {bin,cgi-bin,doc}/*
 sed -i -e 's#!/bin/perl#!%{__perl}#' */src/*
 sed -i -e 's#!/bin/perl#!%{__perl}#' */*/*/*.pm
 
-
-
 pod2man --section=8 --center="BackupPC manual" doc/BackupPC.pod backuppc.8
 %{__perl} -e "s/.IX Title.*/.SH NAME\nbackuppc \\- BackupPC manual/g" -p -i.tmp backuppc.8
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d		$RPM_BUILD_ROOT/etc/{rc.d/init.d,httpd/httpd.conf} \
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,httpd/httpd.conf} \
 			$RPM_BUILD_ROOT%{_mandir}/man8 \
 			$RPM_BUILD_ROOT%{_datadir}/%{name}/www/{html,cgi-bin,html/doc} \
 			$RPM_BUILD_ROOT%{_var}/{lib/%{name}/pc/localhost,log} \
@@ -199,6 +196,7 @@
 cd $RPM_BUILD_ROOT%{_datadir}/%{name}/www/html
 ln -sf %{_sysconfdir}/%{name}/BackupPC_stnd.css BackupPC_stnd.css
 
+touch $RPM_BUILD_ROOT%{_sysconfdir}/backuppc/password
 
 %if 0
 %pre
@@ -208,13 +206,6 @@
 %endif
 
 %post
-if [ ! -f %{_sysconfdir}/backuppc/password ]; then
-# FIXME? $PASS variable cames from?
-	openssl rand -base64 6 > $PASS
-	%{_bindir}/htpasswd -cb %{_sysconfdir}/backuppc/password admin $PASS
-	echo "Your web password is: $PASS."
-	echo "Change this: htpasswd -b %{_sysconfdir}/backuppc/password user password"
-fi
 %service backuppc restart "BackupPC"
 
 %preun
@@ -236,7 +227,6 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_datadir}/%{name}/www/cgi-bin/BackupPC_Admin
-#%config(noreplace) %verify(not md5 size mtime) %{_datadir}/%{name}/www/cgi-bin/.htaccess
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/www/html/doc
 %{_datadir}/%{name}/www/html/doc/*
@@ -274,6 +264,7 @@
 %{_sysconfdir}/httpd/httpd.conf/93_backuppc.conf
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %verify(not md5 mtime size) %attr(644,%{BPCuser},%{BPCgroup})  %{_sysconfdir}/%{name}/*
+%config(noreplace) %verify(not md5 mtime size) %attr(640,root,http) %{_sysconfdir}/backuppc/password
 %{_mandir}/man8/backuppc*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -282,6 +273,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.62  2006/04/16 20:23:26  glen
+- killed idiotic code
+
 Revision 1.61  2006/04/16 20:18:47  glen
 - use %service
 
@@ -289,10 +283,10 @@
 - description
 
 Revision 1.59  2006/01/26 13:07:19  wolvverine
-- antyspam
+- antispam
 
 Revision 1.58  2006/01/26 13:04:37  wolvverine
-- antyspam in log
+- antispam in log
 
 Revision 1.57  2006/01/26 12:53:14  wolvverine
 - pl description
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/backuppc.spec?r1=1.61&r2=1.62&f=u