Author: glen Date: Wed Oct 25 21:52:26 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- -base instead of -cron as suggested by blues (not that i like it this way)
---- Files affected:
SPECS:
webalizer.spec (1.84 -> 1.85)
---- Diffs:
================================================================
Index: SPECS/webalizer.spec
diff -u SPECS/webalizer.spec:1.84 SPECS/webalizer.spec:1.85
--- SPECS/webalizer.spec:1.84 Tue Oct 17 09:30:54 2006
+++ SPECS/webalizer.spec Wed Oct 25 23:52:20 2006
@@ -1,6 +1,7 @@
# $Revision$, $Date$
# TODO
# - subpackage for cgi?
+# - think and fix the trigger.
#
# Conditional build:
%bcond_with db3 # build with db3 instead of db 4.x
@@ -15,7 +16,7 @@
Summary(uk): đŇĎÇŇÁÍÁ ÁÎÁĚŚÚŐ log-ĆÁĘĚŐ web/ftp/proxy-ÓĹŇ×ĹŇÁ
Name: webalizer
Version: %{ver}_%{patchlvl}
-Release: 16.5
+Release: 16.6
License: GPL v2
Group: Networking/Utilities
Source0:
ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlvl}-src.tar.bz2
@@ -38,6 +39,7 @@
BuildRequires: gettext-devel
BuildRequires: libpng-devel >= 1.0.8
BuildRequires: zlib-devel
+Requires: %{name}-base = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _webdir /home/services/httpd
@@ -88,17 +90,12 @@
ËŇÁ§ÎŚ (ÂŇĎŐÚĹŇ ÔÁ ĐĎÓÉĚÁÎÎŃ ÄĎÓÔŐĐÎŚ ĚÉŰĹ ŃËÝĎ ÓĹŇ×ĹŇ ĐÉŰĹ ĚĎÇÉ ×
ËĎÍÂŚÎĎ×ÁÎĎÍŐ ĆĎŇÍÁÔŚ).
-%package cron
-Summary: Webalizer cron process
-Summary(pl): Uruchamianie Webalizera jako zadania crona
+%package base
+Summary: Webalizer programs and manuals
Group: Networking/Utilities
-Requires: %{name} = %{version}-%{release}
-%description cron
-Webalizer cron process.
-
-%description cron -l pl
-Uruchamianie Webalizera jako zadania crona.
+%description base
+Webalizer programs and manual pages.
%prep
%setup -q -n %{name}-%{ver}-%{patchlvl}
@@ -151,7 +148,7 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%triggerpostun cron -- webalizer < 2.01_10-14
+%triggerpostun -- webalizer < 2.01_10-14
echo "Upgrading from webalizer < 2.01_10-14"
chgrp stats %{_sysconfdir}/webalizer/*
chmod g+r %{_sysconfdir}/webalizer/*
@@ -165,6 +162,13 @@
%files -f %{name}.lang
%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/cron.d/webalizer
+%attr(2755,root,stats) %dir %{_sysconfdir}/%{name}
+%attr(755,root,root) %{_sbindir}/webalizer.cron
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/webalizer
+
+%files base
+%defattr(644,root,root,755)
%doc CHANGES *README* country-codes.txt
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/webalizer.conf
%attr(755,root,root) %{_bindir}/webalizer
@@ -172,19 +176,15 @@
%{_mandir}/man1/*
%{_webdir}/icons/*
-%files cron
-%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/cron.d/webalizer
-%attr(2755,root,stats) %dir %{_sysconfdir}/%{name}
-%attr(755,root,root) %{_sbindir}/webalizer.cron
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/webalizer
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[EMAIL PROTECTED]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.85 2006/10/25 21:52:20 glen
+- -base instead of -cron as suggested by blues (not that i like it this way)
+
Revision 1.84 2006/10/17 07:30:54 qboosh
- pl for -cron, -cron R: main
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/webalizer.spec?r1=1.84&r2=1.85&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
