Changes - j0ke.net Open Build Service

Changes of Revision 64

[-] [+]	Changed	vhcs2.spec
@@ -17,6 +17,9 @@ Source3: 2.4.7.1_suse_master_cf.diff Source4: 2.4.7.1_crontab.diff Source5: smtpd.conf + +Source10: awstats-dist.tar.bz2 +Source11: vhcs2awstats Patch0: %{name}-rpl.diff BuildRoot: /tmp/vhcs-%{version} @@ -30,6 +33,7 @@ %define _distversion %{suse_version} %define apa apache2 %define apa_vh_dir vhosts.d +%define vhcs_awstatsdir %{vhcsroot}/vhcs2 %if 0%{?sles_version} %define _disttag sles @@ -43,6 +47,7 @@ %define _vhcsroot var/www %define apa httpd %define apa_vh_dir conf.d +%define vhcs_awstatsdir %{vhcsroot}/vhcs2 %if 0%{?centos_version} %define _disttag centos @@ -61,6 +66,7 @@ %endif + # perl requirements Requires: perl-Archive-Tar Requires: perl-Archive-Zip @@ -198,7 +204,7 @@ %endif Requires: patch sed gawk tcl -BuildRequires: perl gcc glibc-devel patch +BuildRequires: perl gcc glibc-devel patch tar bzip2 sed %package pma Summary: phpmyadmin from VHCS distribution @@ -256,8 +262,8 @@ install -m 755 -d $RPM_BUILD_ROOT/usr/sbin cd $RPM_BUILD_ROOT/usr/sbin ln -sf ../../etc/init.d/vhcs2_daemon rcvhcs2_daemon -install -m 755 -d $RPM_BUILD_ROOT%{_docdir}/vhcs2 -install -m 755 -d $RPM_BUILD_ROOT/etc/named.d/ +%__install -m 755 -d $RPM_BUILD_ROOT%{_docdir}/vhcs2 +%__install -m 755 -d $RPM_BUILD_ROOT/etc/named.d/ %{?stable:install -m 644 %{S:1} $RPM_BUILD_DIR/%{name}-%{version}/docs/} %{?stable:install -m 755 %{S:2} $RPM_BUILD_DIR/%{name}-%{version}/docs/} @@ -284,6 +290,14 @@ find %{_vhcsroot} -type f \| grep -v vhcs2-db-keys \| grep -v "tools/pma" \| sed 's,^,\%attr(-\,root\,root) /,' >> $RPM_BUILD_DIR/file.list.%{name} find %{_vhcsroot} -type l \| sed 's,^,\%attr(-\,root\,root) /,' >> $RPM_BUILD_DIR/file.list.%{name} +# awstats +tar -C %{buildroot}/%{vhcs_awstatsdir} -xjf %{S:10} +for FILE in `ls -1A %{buildroot}/%{vhcs_awstatsdir}/awstats/` ; do + sed -i s#@VHCS_AWSTATSDIR@#%{vhcs_awstatsdir}/awstats#g %{buildroot}/%{vhcs_awstatsdir}/awstats/${FILE} + sed -i s#@VHCSROOT@#%{vhcsroot}#g %{buildroot}/%{vhcs_awstatsdir}/awstats/${FILE} + sed -i s#@DOCDIR@#%{_docdir}/vhcs2#g %{buildroot}/%{vhcs_awstatsdir}/awstats/${FILE} +done +%__install -D -m 0644 %{S:11} %{buildroot}/etc/cron.d/vhcs2awstats %clean rm -rf $RPM_BUILD_ROOT @@ -452,6 +466,8 @@ %files amavis %files awstats +%{vhcs_awstatsdir}/awstats +/etc/cron.d/vhcs2awstats ################################################################################# # PRE
	Added	awstats-dist.tar.bz2 ^
[-] [+]	Added	vhcs2awstats ^
@@ -0,0 +1 @@ +30 /2 * * root @VHCS_AWSTATSDIR@/create_static_awstats.sh >/dev/null 2>&1