- adapter, add buildroot

Changed files:
    free-sa.spec -> 1.4

diff --git a/free-sa.spec b/free-sa.spec
index d86e956356a22088cd22f3d2ebe5de44e570e6a4..5ab8b9f99af087a28379d4eb878090a7a2d4529f 100644 (file)
--- a/free-sa.spec
+++ b/free-sa.spec
@@ -1,13 +1,14 @@
+Summary:       Squid report generator per user/ip/name
 Name:          free-sa
 Version:       1.5.0
 Release:       0.1
-Summary:       Squid report generator per user/ip/name
+License:       GPL v3
+Group:         Networking
 URL:           http://free-sa.sourceforge.net/
-Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:       http://dl.sourceforge.net/free-sa/%{name}-%{version}.tar.gz
 # Source0-md5: 247d942cbe5cbb86c7d2fc1616646c4c
-Patch0:                %name-global.mk.patch
-License:       GPL v3
-Group:          Networking
+Patch0:                %{name}-global.mk.patch
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Free-SA is statistic analyzer for daemons log files similar to SARG.
@@ -27,7 +28,7 @@ generated HTML/CSS reports code.
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       PREFIX=$RPM_BUILD_ROOT/usr
+PREFIX=$RPM_BUILD_ROOT%{_prefix}
 
 %{__make} -C themes install \
        WWWDIR=$RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -35,9 +36,9 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_mandir}
 install -d $RPM_BUILD_ROOT%_sysconfdir/%{name}
 
-mv $RPM_BUILD_ROOT/usr/man/* $RPM_BUILD_ROOT/%{_mandir}/
-rm -rf $RPM_BUILD_ROOT%{_prefix}/{man,share/doc} 
-install etc/free-sa.conf.sample.in $RPM_BUILD_ROOT/%_sysconfdir/%{name}/%{name}.conf
+mv $RPM_BUILD_ROOT%{_prefix}/man/* $RPM_BUILD_ROOT%{_mandir}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/{man,share/doc}
+install etc/free-sa.conf.sample.in $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,9 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc COPYING ChangeLog FAQ INSTALL README THANKS
-%config(noreplace) %_sysconfdir/%{name}/*
+%config(noreplace) %{_sysconfdir}/%{name}/*
 %attr(755,root,root) %{_bindir}/%{name}
 %{_datadir}/%{name}/*
 %{_mandir}/man[15]/*
 %dir %{_datadir}/%{name}
-%dir %_sysconfdir/%{name}
+%dir %{_sysconfdir}/%{name}