Changes - j0ke.net Open Build Service

Changes of Revision 7

[-] [+]	Added	flowd.changes
@@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Wed Dec 19 20:08:22 UTC 2012 - cs@linux-administrator.com + +- update to release 0.9.1 +
[-] [+]	Deleted	flowd-suse-init.spec ^
@@ -1,25 +0,0 @@ ---- flowd.init.suse.orig 2009-05-02 15:07:29.000000000 +0200 -+++ flowd.init.suse 2009-05-02 16:55:38.000000000 +0200 -@@ -2,9 +2,10 @@ - - ### BEGIN INIT INFO - # Provides: flowd --# Required-Start: $network $local_fs --# Should-Start: $named --# Required-Stop: -+# Required-Start: $network $local_fs $remote_fs -+# Should-Start: $named -+# Required-Stop: $null -+# Should-Stop: $null - # Default-Start: 3 5 - # Default-Stop: - # Description: Start flowd -@@ -12,7 +13,7 @@ - - DAEMON="Flowd daemon" - DAEMON_BIN="/usr/sbin/flowd" --DAEMON_CONF="/usr/etc/flowd.conf" -+DAEMON_CONF="/etc/flowd.conf" - DAEMON_PIDFILE="/var/run/flowd.pid" - DAEMON_OPT="" - #DAEMON_USER="root"
[-] [+]	Changed	flowd.spec ^
@@ -1,10 +1,11 @@ Summary: The flowd NetFlow collector daemon Name: flowd -Version: 0.9 +Version: 0.9.1 Release: 10 -URL: http://www.mindrot.org/flowd.html +#URL: http://www.mindrot.org/flowd.html +URL: http://code.google.com/p/flowd/ Source0: flowd-%{version}.tar.bz2 -Patch0: flowd-suse-init.spec +Patch0: flowd-suse-init.patch License: BSD Group: Productivity/Networking/Diagnostic BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot @@ -77,31 +78,30 @@ ./setup.py build (cd Flowd-perl ; CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL \ - PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor; make ) + PREFIX=%{buildroot}/usr INSTALLDIRS=vendor; make ) %install -rm -rf $RPM_BUILD_ROOT - -%makeinstall +%__make DESTDIR=%{buildroot} install # Misc stuff install -d -m755 %{buildroot}/var/lib/flowd %if 0%{?centos_version} \|\| 0%{?fedora_version} \|\| 0%{?rhel_version} -install -D -m755 flowd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/flowd +install -D -m755 flowd.init %{buildroot}/etc/rc.d/init.d/flowd %endif %if 0%{?suse_version} -install -D -m755 flowd.init.suse $RPM_BUILD_ROOT/etc/init.d/flowd +install -D -m755 flowd.init.suse %{buildroot}/etc/init.d/flowd +ln -sf ../../etc/init.d/flowd %{buildroot}%{_sbindir}/rcflowd %endif # Perl module (cd Flowd-perl; make install) -find ${RPM_BUILD_ROOT}/usr/lib/perl5 \ +find %{buildroot}/usr/lib/perl5 \ $ -name perllocal.pod -o -name .packlist $ -exec rm -v {} \; -find ${RPM_BUILD_ROOT}/usr/lib/perl5 \ - -type f -print \| sed "s@^$RPM_BUILD_ROOT@@g" > flowd-perl-filelist -find ${RPM_BUILD_ROOT}%{_mandir} \ +find %{buildroot}/usr/lib/perl5 \ + -type f -print \| sed "s@^%{buildroot}@@g" > flowd-perl-filelist +find %{buildroot}%{_mandir} \ -type f \| grep -E '[0-9]pm(.gz)?$' \| \ - sed "s@^$RPM_BUILD_ROOT@@g;s@\$@@" >> \ + sed "s@^%{buildroot}@@g;s@\$@@" >> \ flowd-perl-filelist if [ "$(cat flowd-perl-filelist)X" = "X" ] ; then @@ -110,16 +110,18 @@ fi # Python module -./setup.py install --prefix=%{_prefix} --optimize 1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES +./setup.py install --prefix=%{_prefix} --optimize 1 --root=%{buildroot} --record=INSTALLED_FILES sed -e 's\|/[^/]$\|\|' INSTALLED_FILES \| grep "site-packages/" \| \ sort -u \| awk '{ print "%attr(755,root,root) %dir " $1}' > INSTALLED_DIRS cat INSTALLED_FILES INSTALLED_DIRS > INSTALLED_OBJECTS # fix doc permissions -chmod 0644 tools/ reader.py reader.pl +#chmod 0644 tools/* reader.py reader.pl +find tools -type f -exec chmod 0644 {} \; +chmod 0644 reader.py reader.pl %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %pre %{_sbindir}/groupadd -r _flowd 2>/dev/null \|\| : @@ -161,6 +163,7 @@ %endif %if 0%{?suse_version} %attr(0755,root,root) %config /etc/init.d/flowd +%attr(0755,root,root) %{_sbindir}/rcflowd %endif %attr(0755,root,root) %{_sbindir}/flowd
[-] [+]	Added	flowd-suse-init.patch ^
@@ -0,0 +1,25 @@ +--- flowd.init.suse.orig 2009-05-02 15:07:29.000000000 +0200 ++++ flowd.init.suse 2009-05-02 16:55:38.000000000 +0200 +@@ -2,9 +2,10 @@ + + ### BEGIN INIT INFO + # Provides: flowd +-# Required-Start: $network $local_fs +-# Should-Start: $named +-# Required-Stop: ++# Required-Start: $network $local_fs $remote_fs ++# Should-Start: $named ++# Required-Stop: $null ++# Should-Stop: $null + # Default-Start: 3 5 + # Default-Stop: + # Description: Start flowd +@@ -12,7 +13,7 @@ + + DAEMON="Flowd daemon" + DAEMON_BIN="/usr/sbin/flowd" +-DAEMON_CONF="/usr/etc/flowd.conf" ++DAEMON_CONF="/etc/flowd.conf" + DAEMON_PIDFILE="/var/run/flowd.pid" + DAEMON_OPT="" + #DAEMON_USER="root"
	Changed	flowd-0.9.1.tar.bz2 ^