From 1b96c2a2e47ee33c566beadb5ae44c0307c9f010 Mon Sep 17 00:00:00 2001 From: Darold Date: Sun, 16 Dec 2012 17:31:59 +0100 Subject: [PATCH] Update squidanalyzer.spec for RPM build. Thanks to David Walser for the patch. --- packaging/RPM/squidanalyzer.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packaging/RPM/squidanalyzer.spec b/packaging/RPM/squidanalyzer.spec index 19b1c8a..22aea07 100644 --- a/packaging/RPM/squidanalyzer.spec +++ b/packaging/RPM/squidanalyzer.spec @@ -7,7 +7,7 @@ Release: %mkrel 1 License: GPLv3 Group: Monitoring URL: http://%{name}.darold.net/ -Source: http://prdownloads.sourceforge.net/squid-report/SquidAnalyzer-%{version}.tar.gz +Source: http://prdownloads.sourceforge.net/squid-report/%{name}-%{version}.tar.gz Requires: squid BuildRequires: perl BuildArch: noarch @@ -26,7 +26,7 @@ or more often with heavy proxy usage. %prep -%setup -q -n SquidAnalyzer-%{version} +%setup -q %build perl Makefile.PL DESTDIR=%{buildroot} LOGFILE=%{_logdir}/squid/access.log BINDIR=%{_sbindir} HTMLDIR=%{contentdir}/html/%{name} BASEURL=/%{name} MANDIR=%{_mandir}/man3 QUIET=yes @@ -37,6 +37,7 @@ perl Makefile.PL DESTDIR=%{buildroot} LOGFILE=%{_logdir}/squid/access.log BINDIR rm -rf %{buildroot} %makeinstall_std +install etc/* %{buildroot}%{_sysconfdir}/%{name}/ install -d %{buildroot}%{_sysconfdir}/cron.daily echo -e "#!/bin/sh\n%{_sbindir}/squid-analyzer" > %{buildroot}%{_sysconfdir}/cron.daily/0%{name} @@ -56,9 +57,11 @@ echo -e "#!/bin/sh\n%{_sbindir}/squid-analyzer" > %{buildroot}%{_sysconfdir}/cro %attr(0755,root,squid) %dir %{_sysconfdir}/%{name}/lang %{_sysconfdir}/%{name}/lang/* %attr(0755,root,squid) %dir %{contentdir}/html/%{name} -%{contentdir}/html/%{name}/logo-%{name}.png +%{contentdir}/html/%{name}/flotr2.js %{contentdir}/html/%{name}/sorttable.js %{contentdir}/html/%{name}/%{name}.css +%attr(0755,root,squid) %dir %{contentdir}/html/%{name}/images +%{contentdir}/html/%{name}/images/*.png %clean rm -rf %{buildroot}