From 7296a9e35695b87dd69bfcf39ee6365d1330ce2d Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 20 Nov 2005 10:46:46 +0000 Subject: [PATCH] - 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 Changed files: IRRToolSet.spec -> 1.19 --- IRRToolSet.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/IRRToolSet.spec b/IRRToolSet.spec index bede3d1..06ab266 100644 --- a/IRRToolSet.spec +++ b/IRRToolSet.spec @@ -11,6 +11,7 @@ Patch0: %{name}-DESTDIR.patch 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 @@ -20,10 +21,6 @@ BuildRequires: libstdc++-devel 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) @@ -39,12 +36,15 @@ IRRToolSet jest zestawem narz %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 @@ -57,7 +57,7 @@ install -d $RPM_BUILD_ROOT%{_sbindir} %{__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 @@ -66,6 +66,6 @@ rm -rf $RPM_BUILD_ROOT %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/* -- 2.43.0