rpm/wireshark
SHA256
1
0
Fork 0
forked from pool/wireshark
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wireshark?expand=0&rev=9

Browse Source
This commit is contained in:
OBS User unknown 2008-01-10 02:21:45 +00:00 committed by Git OBS Bridge
parent c748206571
commit 9455770b20
3 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
wireshark-0.99.7-strptime.patch Normal file
View File

@ -0,0 +1,38 @@
--- text2pcap.c
+++ text2pcap.c
@@ -77,6 +77,19 @@
* snaplength is automatically set to 64K.
*/
+/*
+ * Just make sure we include the prototype for strptime as well
+ * (needed for glibc 2.2) but make sure we do this only if not
+ * yet defined.
+ */
+
+#ifndef __USE_XOPEN
+# define __USE_XOPEN
+#endif
+#ifndef _XOPEN_SOURCE
+# define _XOPEN_SOURCE
+#endif
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
@@ -87,15 +100,6 @@
#include <string.h>
#include <wiretap/file_util.h>
-/*
- * Just make sure we include the prototype for strptime as well
- * (needed for glibc 2.2) but make sure we do this only if not
- * yet defined.
- */
-#ifndef __USE_XOPEN
-# define __USE_XOPEN
-#endif
-
#include <time.h>
#include <glib.h>

6
wireshark.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jan 9 13:20:10 CET 2008 - prusnak@suse.cz
- fix strptime function inclusion (strptime.patch)
- do not package non linux READMEs
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 19 13:34:17 CET 2007 - prusnak@suse.cz Wed Dec 19 13:34:17 CET 2007 - prusnak@suse.cz

11
wireshark.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package wireshark (Version 0.99.7) # spec file for package wireshark (Version 0.99.7)
# #
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
# package are under the same license as the package itself. # package are under the same license as the package itself.
# #
@ -17,13 +17,14 @@ Group: Productivity/Networking/Diagnostic
AutoReqProv: on AutoReqProv: on
Summary: A Network Traffic Analyser Summary: A Network Traffic Analyser
Version: 0.99.7 Version: 0.99.7
Release: 1 Release: 2
Url: http://www.wireshark.org/ Url: http://www.wireshark.org/
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Source1: %{name}.desktop Source1: %{name}.desktop
Source2: %{name}.png Source2: %{name}.png
Source3: include.filelist Source3: include.filelist
Patch0: %{name}-%{version}-help.patch Patch0: %{name}-%{version}-help.patch
Patch1: %{name}-%{version}-strptime.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: ethereal Provides: ethereal
Obsoletes: ethereal Obsoletes: ethereal
@ -111,6 +112,7 @@ Authors:
%prep %prep
%setup -q %setup -q
%patch0 %patch0
%patch1
%build %build
%{suse_update_config -f wiretap .} %{suse_update_config -f wiretap .}
@ -155,7 +157,7 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYING NEWS README* %doc AUTHORS COPYING NEWS README README.linux README.vmware
%{_mandir}/man1/[^i]* %{_mandir}/man1/[^i]*
%{_mandir}/man4/* %{_mandir}/man4/*
%{_datadir}/applications/*.desktop %{_datadir}/applications/*.desktop
@ -174,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/idl2wrs* %{_mandir}/man1/idl2wrs*
%changelog %changelog
* Wed Jan 09 2008 - prusnak@suse.cz
- fix strptime function inclusion (strptime.patch)
- do not package non linux READMEs
* Wed Dec 19 2007 - prusnak@suse.cz * Wed Dec 19 2007 - prusnak@suse.cz
- updated to 0.99.7 - updated to 0.99.7
* security fixes * security fixes