rpms/ethereal/devel ethereal.spec,1.60,1.61

[fedora-cvs-commits at redhat.com]

Author: rvokal

Update of /cvs/dist/rpms/ethereal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12958

Modified Files:
	ethereal.spec 
Log Message:
- 0.10.14 prerelease, fixed conflicts with error.h


Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/ethereal.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ethereal.spec	22 Dec 2005 16:17:03 -0000	1.60
+++ ethereal.spec	22 Dec 2005 16:22:17 -0000	1.61
@@ -1,10 +1,10 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define svn_version 16389
+%define svn_version 16880
 
 Summary: 	Network traffic analyzer
 Name: 		ethereal
 Version:	0.10.14
-Release: 
+Release: 	0.pre1
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://www.ethereal.com/distribution/%{name}-%{version}-SVN-%{svn_version}.tar.gz
@@ -13,7 +13,8 @@
 Source3:	ethereal.desktop
 Source4:	ethereal.png
 Patch4:		ethereal-0.10.13-pie.patch
-Patch5:		ethereal-0.10.12-qos-header.patch
+#Patch5:	ethereal-0.10.12-qos-header.patch
+Patch6:		%{name}-%{version}-SVN-%{svn_version}-errno.patch
 Url: 		http://www.ethereal.com/
 BuildRoot: 	%{_tmppath}/%{name}-root
 Requires: 	libpcap >= 0.6
@@ -51,7 +52,8 @@
 %prep
 %setup -q -n %{name}-%{version}-SVN-%{svn_version}
 %patch4 -p1 -b .pie
-%patch5 -p0 -b .qos
+#%patch5 -p0 -b .qos
+%patch6 -p1 -b .errno
 
 %build
 %ifarch s390 s390x
@@ -161,6 +163,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 Radek Vokal <rvokal at redhat.com> 0.10.14-0.pre1
+- 0.10.14 prerelease, fix for conflict with error.h
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt