--- free-sa.spec	2007-08-07 16:33:32 +0400
+++ free-sa-1.5.1.spec	2009-02-17 23:08:50 +0300
@@ -1,31 +1,30 @@
-%define _htmldir /var/www/html
-
 Name: free-sa
-Version: 1.3.3
+Version: 1.5.1
 Release: alt1
 
-Packager: Avramenko Andrew <liks@altlinux.ru>
+Packager: Avramenko Andrew <liks at altlinux.ru>
 Summary: Squid report generator per user/ip/name
 URL: http://free-sa.sourceforge.net/
-Source: %name-%version.tar
-Patch0: %name-as-needed.patch
-Patch1: %name-alt-makefile.patch
-Patch2: %name-alt-global.mk.patch
+Source: %name-%version.tar.gz
+
+Patch0: %name-alt-global.mk.patch
+Patch1: %name-as-needed.patch
+Patch2: %name-alt-makefile.patch
 
 License: GPL
 Group: Monitoring
 
 %description
-Free-SA is statistic analyzer for daemons log files similar to SARG. 
-Its main advantages over SARG are much better speed (7x-20x times), 
-more reports support, crossplatform work and W3C compliance of generated 
+Free-SA is statistic analyzer for daemons log files similar to SARG.
+Its main advantages over SARG are much better speed (7x-20x times),
+more reports support, crossplatform work and W3C compliance of generated
 HTML/CSS reports code.
 
 %prep
-%setup -q
+%setup -q -n %name-%version
 %patch0 -p1
 %patch1 -p1
-%patch2 -p0
+%patch2 -p1
 
 %build
 %make
@@ -36,7 +35,7 @@
 mkdir -p %buildroot/%_sysconfdir/%name
 mv %buildroot/usr/man/* %buildroot/%_mandir/
 rm -rf %buildroot/usr/man
-mv %buildroot%_sysconfdir/%name/%name.conf.sample %buildroot/%_sysconfdir/%name/%name.conf
+cp %buildroot%_sysconfdir/%name/%name.conf.sample %buildroot/%_sysconfdir/%name/%name.conf
 
 %files
 %defattr(-,root,squid)
@@ -46,8 +45,6 @@
 %_datadir/%name/*
 %_datadir/doc/%name-%version/*
 %config(noreplace) %_sysconfdir/%name/*
-%attr(0775,root,squid) %dir %_htmldir/%name
-%_htmldir/%name/*
 %dir /var/cache/%name
 
 %changelog