Changes - j0ke.net Open Build Service

Changes of Revision 26

[-] [+]	Changed	awstats.spec
@@ -11,8 +11,6 @@ # norootforbuild Name: awstats -Requires: apache2 perl perl-Net-DNS -BuildRequires: java2-devel-packages dos2unix License: GNU General Public License (GPL) Group: Productivity/Networking/Web/Utilities Version: 6.9 @@ -26,6 +24,7 @@ Source6: awstats-update.8 Source7: awstats.logrotate Source8: apache2.awstats.conf +Source9: awstats-rpmlintrc Patch: %{name}-%{version}.patch Patch1: %{name}-%{version}-CVE-2006-2237_read_open.patch Patch2: %{name}-%{version}-geo.patch @@ -38,6 +37,9 @@ Patch10: %{name}-%{version}-java15.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +AutoReqProv: no +Requires: apache2 perl perl-Net-DNS logrotate cron +BuildRequires: java2-devel-packages dos2unix %if 0%{?suse_version} %define apache_serverroot /srv/www @@ -70,23 +72,28 @@ find -type f -name .cvsignore -print0 \| xargs -r0 rm -v %build -cd wwwroot/classes/src -./Makefile.pl +pushd wwwroot/classes/src + ./Makefile.pl +popd +# fix dos linebreaks in tools +pushd tools + dos2unix .pl +popd %install -install -d -m 755 $RPM_BUILD_ROOT%{apache_serverroot}/cgi-bin -install -d -m 755 $RPM_BUILD_ROOT%{apache_serverroot}/cgi-bin/classes -install -d -m 755 $RPM_BUILD_ROOT%{apache_serverroot}/htdocs/icons/awstats -install -d -m 755 $RPM_BUILD_ROOT/var/lib/awstats/lang -install -d -m 755 $RPM_BUILD_ROOT/var/cache/awstats -install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/apache2 -install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf.d -install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/awstats -install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/cron.d -install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d -install -d -m 755 $RPM_BUILD_ROOT/usr/sbin -install -d -m 755 $RPM_BUILD_ROOT/usr/share/apache2/icons/awstats/ -install -d -m 755 $RPM_BUILD_ROOT/%{_mandir}/man8 +%__install -d -m 755 $RPM_BUILD_ROOT%{apache_serverroot}/cgi-bin +%__install -d -m 755 $RPM_BUILD_ROOT%{apache_serverroot}/cgi-bin/classes +%__install -d -m 755 $RPM_BUILD_ROOT%{apache_serverroot}/htdocs/icons/awstats +%__install -d -m 755 $RPM_BUILD_ROOT/var/lib/awstats/lang +%__install -d -m 755 $RPM_BUILD_ROOT/var/cache/awstats +%__install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/apache2 +%__install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf.d +%__install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/awstats +%__install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/cron.d +%__install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d +%__install -d -m 755 $RPM_BUILD_ROOT/usr/sbin +%__install -d -m 755 $RPM_BUILD_ROOT/usr/share/apache2/icons/awstats/ +%__install -d -m 755 $RPM_BUILD_ROOT/%{_mandir}/man8 cp -a wwwroot/icon/ $RPM_BUILD_ROOT%{apache_serverroot}/htdocs/icons/awstats/ cp -a wwwroot/icon/* $RPM_BUILD_ROOT/usr/share/apache2/icons/awstats/ cp -a wwwroot/cgi-bin/lang $RPM_BUILD_ROOT/var/lib/awstats/ @@ -96,20 +103,19 @@ cp -a wwwroot/cgi-bin/awstats.model.conf $RPM_BUILD_ROOT%{_sysconfdir}/awstats/awstats.conf.web cp -a wwwroot/cgi-bin/awstats.model.conf.ftp $RPM_BUILD_ROOT%{_sysconfdir}/awstats/awstats.conf.ftp cp -a wwwroot/cgi-bin/awstats.model.conf.smtp $RPM_BUILD_ROOT%{_sysconfdir}/awstats/awstats.conf.smtp -install -m 644 $RPM_SOURCE_DIR/apache2.awstats.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf.d/awstats.conf -install -d -m 755 $RPM_BUILD_ROOT/var/adm/fillup-templates -install -m 644 $RPM_SOURCE_DIR/cron.d.awstats $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/suse-awstats -install -m 755 $RPM_SOURCE_DIR/awstats-update $RPM_BUILD_ROOT/usr/sbin -install -m 644 $RPM_SOURCE_DIR/awstats-update.8 $RPM_BUILD_ROOT%{_mandir}/man8 -install -m 644 $RPM_SOURCE_DIR/awstats.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/awstats -# fix dos linebreaks in tools -dos2unix tools/.pl +%__install -m 644 $RPM_SOURCE_DIR/apache2.awstats.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf.d/awstats.conf +%__install -d -m 755 $RPM_BUILD_ROOT/var/adm/fillup-templates +%__install -m 644 $RPM_SOURCE_DIR/cron.d.awstats $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/suse-awstats +%__install -m 755 $RPM_SOURCE_DIR/awstats-update $RPM_BUILD_ROOT/usr/sbin +%__install -m 644 $RPM_SOURCE_DIR/awstats-update.8 $RPM_BUILD_ROOT%{_mandir}/man8 +%__install -m 644 $RPM_SOURCE_DIR/awstats.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/awstats +rm -rf $RPM_BUILD_ROOT%{apache_serverroot}/cgi-bin/lib/browsers.pm.orig %clean rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,755) +%defattr(-,root,root) %doc README.TXT docs/ wwwroot/js wwwroot/css tools %config(noreplace) /etc/logrotate.d/awstats %dir /etc/awstats @@ -117,16 +123,17 @@ %attr(644,root,root) %config /etc/awstats/awstats.conf.ftp %attr(644,root,root) %config /etc/awstats/awstats.conf.smtp %config /etc/cron.d/suse-awstats -%{_sbindir}/awstats-update -%doc %{_mandir}/man8/awstats-update.8.gz -%{apache_serverroot}/cgi-bin/awstats.pl +%attr(755,root,root) %{_sbindir}/awstats-update +%{_mandir}/man8/awstats-update.8.gz +%attr(755,root,root) %{apache_serverroot}/cgi-bin/awstats.pl %{apache_serverroot}/cgi-bin/plugins %{apache_serverroot}/cgi-bin/lib %{apache_serverroot}/cgi-bin/classes %dir %{apache_serverroot}/htdocs/icons %{apache_serverroot}/htdocs/icons/* -/var/lib/awstats -/var/cache/awstats +%dir /var/lib/awstats +/var/lib/awstats/lang +%dir /var/cache/awstats %dir /etc/apache2 %dir /etc/apache2/conf.d %dir /usr/share/apache2 @@ -137,12 +144,10 @@ %changelog * Mon Jan 12 2009 Carsten Schoene <vhcs@j0ke.net> - 6.9-50 - update to release 6.9 -- reworked all patches + - reworked all patches * Sat Nov 15 2008 Carsten Schoene <vhcs@j0ke.net> - 6.8-45 - update to release 6.8 -- cross-distribution build -- reworked some patches -- added www_SiteConfig patch - - + - cross-distribution build + - reworked some patches + - added www_SiteConfig patch
[-] [+]	Added	awstats-rpmlintrc ^
@@ -0,0 +1,3 @@ +addFilter("awstats.* script-without-shebang") +addFilter("awstats.* wrong-file-end-of-line-encoding") +addFilter("awstats.* spurious-executable-perm")