Accepting request 139369 from home:coolo:branches:openSUSE:Factory

- remove prototypes for flex, they conflict with the real ones

OBS-URL: https://build.opensuse.org/request/show/139369
OBS-URL: https://build.opensuse.org/package/show/security/argus?expand=0&rev=9

argus-3.0.0-flex.diff

@@ -0,0 +1,13 @@
+Index: argus-3.0.0/common/scanner.l
+===================================================================
+--- argus-3.0.0.orig/common/scanner.l
++++ argus-3.0.0/common/scanner.l
+@@ -85,7 +85,7 @@ int argus_lex(void);
+ int argus_get_lineno (void);
+ FILE *argus_get_in (void);
+ FILE *argus_get_out (void);
+-int argus_get_leng (void);
++/* int argus_get_leng (void); */
+ char *argus_get_text(void);
+ void argus_set_lineno (int);
+ void argus_set_in (FILE *);

argus.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 26 05:34:04 UTC 2012 - coolo@suse.com
+
+- remove prototypes for flex, they conflict with the real ones
+
 -------------------------------------------------------------------
 Sun Nov 27 10:05:22 UTC 2011 - coolo@suse.com
 

argus.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package argus
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,29 +16,31 @@
 #
 
 
-
 Name:           argus
-BuildRequires:  bison flex libpcap-devel tcpd-devel tcsh
-License:        BSD3c ; LGPLv2.1+ ; MIT
-Group:          Productivity/Networking/Diagnostic
+BuildRequires:  bison
+BuildRequires:  flex
+BuildRequires:  libpcap-devel
+BuildRequires:  tcpd-devel
+BuildRequires:  tcsh
 Summary:        Network Monitoring Tool
+License:        BSD-3-Clause and LGPL-2.1+ and MIT
+Group:          Productivity/Networking/Diagnostic
 Version:        3.0.0
-Release:        3
+Release:        0
 Url:            http://www.qosient.com/argus/
 Source:         %{name}-%{version}.tar.bz2
 Source1:        rc.argus
 Source2:        sysconfig.argus
 Source3:        README.SuSE
 Source4:        argus_linux.8.gz
-#Patch:          %{name}-%{version}-fixes-1.patch
+Patch0:         %{name}-%{version}-flex.diff
 Patch1:         %{name}-%{version}-libpcap.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package server
-License:        BSD3c ; LGPLv2.1+ ; NON-OSI-COMPLIANT(Restricted Shareware) ; MIT
 PreReq:         %insserv_prereq %fillup_prereq
-Group:          Productivity/Networking/Diagnostic
 Summary:        Daemon for Network Monitoring Tool
+Group:          Productivity/Networking/Diagnostic
 Requires:       argus
 Provides:       argus:/usr/sbin/argus
 
@@ -52,7 +54,7 @@ Daemon for Argus network monitoring tool.
 
 %prep
 %setup -n argus-%{version}
-# %patch -p1
+%patch0 -p1
 %patch1
 cp %{S:3} .
 cp %{S:4} man/man8/