Changes - j0ke.net Open Build Service

Changes of Revision 20

[-] [+]	Changed	snort.spec
@@ -111,11 +111,14 @@ Url: http://www.snort.org/ Source0: http://www.snort.org/dl/2.9.0/%{realname}-%{version}.tar.bz2 Source2: snortd.suse.init +Source3: snort-rpmlintrc Patch0: snortsam-2.9.0.3.diff.gz +Patch1: autojunk.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Packager: Official Snort.org %{for_distro} Vendor: %{vendor} +Requires: logrotate BuildRequires: autoconf, automake, pcre-devel, libpcap-devel zlib-devel flex bison libdnet-devel daq-devel Conflicts: %{conflicts} @@ -211,6 +214,7 @@ %prep %setup -q -n %{realname}-%{version} %patch0 -p1 +%patch1 -p0 ## start: needed for snortsam patch chmod +x autojunk.sh if [ -s configure ] ; then @@ -521,6 +525,9 @@ # Only do this if we are actually removing snort if [ $1 = 0 ] ; then +%if 0%{?suse_version} +%insserv_cleanup +%endif if [ -L %{_sbindir}/snort ]; then %__rm -f %{_sbindir}/snort fi
[-] [+]	Added	autojunk.patch ^
@@ -0,0 +1,14 @@ +--- autojunk.sh.orig 2011-03-27 16:22:48.684330805 +0200 ++++ autojunk.sh 2011-03-27 16:23:44.408065854 +0200 +@@ -1,7 +1,7 @@ + #!/bin/sh + # the list of commands that need to run before we do a compile +-libtoolize --automake --copy ++libtoolize -f --automake --copy + aclocal -I m4 +-autoheader +-automake --add-missing --copy +-autoconf ++autoheader -f ++automake -f --add-missing --copy ++autoconf -f
[-] [+]	Deleted	ltmain.patch ^
@@ -1,28 +0,0 @@ ---- ltmain.sh.bak 2011-03-27 14:18:47.325357466 +0200 -+++ ltmain.sh 2011-03-27 14:19:05.477356715 +0200 -@@ -1,6 +1,6 @@ - # Generated from ltmain.m4sh. - --# ltmain.sh (GNU libtool) 2.2.6b -+# ltmain.sh (GNU libtool) 2.2.6 - # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. -@@ -65,7 +65,7 @@ - # compiler: $LTCC - # compiler flags: $LTCFLAGS - # linker: $LD (gnu? $with_gnu_ld) --# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 -+# $progname: (GNU libtool) 2.2.6 - # automake: $automake_version - # autoconf: $autoconf_version - # -@@ -73,7 +73,7 @@ - - PROGRAM=ltmain.sh - PACKAGE=libtool --VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" -+VERSION="2.2.6" - TIMESTAMP="" - package_revision=1.3017 -
[-] [+]	Added	snort-rpmlintrc ^
@@ -0,0 +1 @@ +addFilter("devel-file-in-non-devel-package")