Hello community, here is the log from the commit of package ntop for openSUSE:Factory checked in at 2012-10-25 12:11:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ntop (Old) and /work/SRC/openSUSE:Factory/.ntop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ntop", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/ntop/ntop.changes 2012-01-25 15:02:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ntop.new/ntop.changes 2012-10-25 12:11:14.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Oct 8 08:38:22 UTC 2012 - [email protected] + +- create logrotate script dynamically during build to have the + correct pkg_user and pkg_group assigned - and also the 'su' + option for younger logrotate packages +- added restart_on_update snipplet in postun + +------------------------------------------------------------------- Old: ---- ntop.logrotate ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntop.spec ++++++ --- /var/tmp/diff_new_pack.7DU4Ag/_old 2012-10-25 12:11:16.000000000 +0200 +++ /var/tmp/diff_new_pack.7DU4Ag/_new 2012-10-25 12:11:16.000000000 +0200 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: ntop Version: 4.1.0 Release: 0 @@ -56,8 +57,8 @@ PreReq: /bin/cat PreReq: sysconfig %if 0%{?suse_version} > 1100 -BuildRequires: libevent-devel BuildRequires: libGeoIP-devel +BuildRequires: libevent-devel %else BuildRequires: libevent %endif @@ -95,7 +96,6 @@ PreReq: sysconfig %endif Source: %{name}-%{version}.tar.bz2 -Source1: ntop.logrotate Source2: rcntop Source3: rc.config.ntop Source4: passcheck.c @@ -139,7 +139,7 @@ rm docs/ntop-autotools.vsd docs/INSTALL rm -f docs/README.Suse cp %{SOURCE5} docs/README.Suse -sed -i "s| ||g" python/templates/rrdAlarmStart.tmpl +sed -i "s|^M||g" python/templates/rrdAlarmStart.tmpl chmod -x python/templates/rrdAlarmStart.tmpl # Remove build time references so build-compare can do its work @@ -189,7 +189,22 @@ # install /var/lib/ntop, so ntop can store it's databases mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/rrd/{flows,graphics,interfaces} # install logrotate script -install -Dm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d +cat >> %{buildroot}%{_sysconfdir}/logrotate.d/%{name} << EOF +/var/log/ntop/*.log { + weekly + missingok + rotate 4 + # ntop doesn't handle SIGHUP + copytruncate + compress + notifempty + create 640 %{pkg_user} %{pkg_user} +%if 0%{?suse_version} > 1200 + su %{pkg_user} %{pkg_user} +%endif +} +EOF # TODO: link to GeoIP databases # extract the files in %%{_sysconfdir}/%%{name} as ntop expects them uncompressed gunzip %{buildroot}%{_sysconfdir}/%{name}/*.gz @@ -219,7 +234,8 @@ %postun %{insserv_cleanup} - /sbin/ldconfig +%{restart_on_update} +/sbin/ldconfig %files %defattr(-,root,root) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
