packages: tcptrace/tcptrace.spec - fix autoconf conflict with 2.64; rel 2

[glen]

Author: glen                         Date: Sun Jun  6 10:20:44 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix autoconf conflict with 2.64; rel 2

---- Files affected:
packages/tcptrace:
   tcptrace.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: packages/tcptrace/tcptrace.spec
diff -u packages/tcptrace/tcptrace.spec:1.23 packages/tcptrace/tcptrace.spec:1.24
--- packages/tcptrace/tcptrace.spec:1.23	Mon Feb 12 23:09:17 2007
+++ packages/tcptrace/tcptrace.spec	Sun Jun  6 12:20:38 2010
@@ -4,17 +4,18 @@
 Summary(pt_BR.UTF-8):	Ferramenta para análise de arquivos de captura de tráfego de rede
 Name:		tcptrace
 Version:	6.6.7
-Release:	1
+Release:	2
 Epoch:		1
 License:	BSD
 Group:		Applications/Networking
 Source0:	http://www.tcptrace.org/download/%{name}-%{version}.tar.gz
 # Source0-md5:	68128dc1817b866475e2f048e158f5b9
+Patch0:		ac264.patch
 URL:		http://www.tcptrace.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	flex >= 2.5.31-4
 BuildRequires:	bison
+BuildRequires:	flex >= 2.5.31-4
 BuildRequires:	libpcap-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -49,10 +50,10 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-cp -f /usr/share/automake/config.sub .
-#%{__aclocal}
+%{__aclocal}
 %{__autoconf}
 %configure
 %{__make}
@@ -60,9 +61,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
-
-install tcptrace xpl2gpl	$RPM_BUILD_ROOT%{_bindir}
-install tcptrace.man		$RPM_BUILD_ROOT%{_mandir}/man1/tcptrace.1
+install -p tcptrace xpl2gpl	$RPM_BUILD_ROOT%{_bindir}
+cp -a tcptrace.man $RPM_BUILD_ROOT%{_mandir}/man1/tcptrace.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,8 +70,9 @@
 %files
 %defattr(644,root,root,755)
 %doc THANKS CHANGES FAQ README* ARGS
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man*/*
+%attr(755,root,root) %{_bindir}/tcptrace
+%attr(755,root,root) %{_bindir}/xpl2gpl
+%{_mandir}/man1/tcptrace.1*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -79,6 +80,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2010/06/06 10:20:38  glen
+- fix autoconf conflict with 2.64; rel 2
+
 Revision 1.23  2007/02/12 22:09:17  glen
 - tabs in preamble
 
@@ -132,9 +136,9 @@
 - new %doc
 
 Revision 1.7  2002/05/21 23:14:48  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.6  2002/02/22 23:29:47  kloczek
 - removed all Group fields translations (oure rpm now can handle translating
@@ -144,7 +148,7 @@
 - updated to 6.0.1 (new stable version).
 
 Revision 1.4  2002/01/18 02:15:09  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.3  2001/10/11 09:34:55  qboosh
 - BuildRequires: automake
@@ -154,4 +158,4 @@
 - configure2_13 used
 
 Revision 1.1  2000/12/20 11:05:45  misiek
-new adapterized spec
+- new adapterized spec
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tcptrace/tcptrace.spec?r1=1.23&r2=1.24&f=u