SPECS: IRRToolSet.spec - readded (cut down) gcc3 patch, but it's n...

[qboosh]

Author: qboosh                       Date: Sun Nov 20 10:46:52 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- readded (cut down) gcc3 patch, but it's not enough to build all tools -
  they require update for internal IRR API now - so disabled build-all patch
- refresh all instances of config.sub

---- Files affected:
SPECS:
   IRRToolSet.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SPECS/IRRToolSet.spec
diff -u SPECS/IRRToolSet.spec:1.18 SPECS/IRRToolSet.spec:1.19
--- SPECS/IRRToolSet.spec:1.18	Thu Nov  3 11:44:37 2005
+++ SPECS/IRRToolSet.spec	Sun Nov 20 11:46:46 2005
@@ -12,6 +12,7 @@
 Patch1:		%{name}-flex.patch
 Patch2:		%{name}-build-all.patch
 Patch3:		NE.cc-20040805.patch
+Patch4:		%{name}-gcc3.patch
 URL:		http://www.isc.org/sw/IRRToolSet/
 BuildRequires:	XFree86-devel
 BuildRequires:	automake
@@ -21,10 +22,6 @@
 BuildRequires:	tcl-devel >= 8.3.4-10
 BuildRequires:	tk-devel >= 8.3.4-5
 BuildRequires:	readline-devel
-%if %{with gcc32}
-BuildRequires:	compat-gcc-32
-BuildRequires:	compat-gcc-32-c++
-%endif
 Provides:	RAToolSet
 Obsoletes:	RAToolSet
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -40,12 +37,15 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
-%configure2_13
+cp -f /usr/share/automake/config.sub src/Core/.aux
+cp -f /usr/share/automake/config.sub src/rpsl
+%configure
 %{__make}
 
 # extract license
@@ -58,7 +58,7 @@
 %{__make} install \
         DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT%{_bindir}/prtraceroute $RPM_BUILD_ROOT%{_sbindir}
+#mv $RPM_BUILD_ROOT%{_bindir}/prtraceroute $RPM_BUILD_ROOT%{_sbindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,7 +67,7 @@
 %defattr(644,root,root,755)
 %doc Changes README* LICENSE
 %attr(755,root,root) %{_bindir}/*
-%attr(4754,root,adm) %{_sbindir}/*
+#%attr(4754,root,adm) %{_sbindir}/prtraceroute
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 
@@ -77,6 +77,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2005/11/20 10:46:46  qboosh
+- readded (cut down) gcc3 patch, but it's not enough to build all tools -
+  they require update for internal IRR API now - so disabled build-all patch
+- refresh all instances of config.sub
+
 Revision 1.18  2005/11/03 10:44:37  arekm
 - partial up
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/IRRToolSet.spec?r1=1.18&r2=1.19&f=u