Author: baggins Date: Thu Sep 13 15:10:39 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 19 - reverted bindir screwup (there are more files than just hostname and netstat) - reverted branch diff (THIS package MUST work reliable all the times)
---- Files affected: SPECS: net-tools.spec (1.84 -> 1.85) ---- Diffs: ================================================================ Index: SPECS/net-tools.spec diff -u SPECS/net-tools.spec:1.84 SPECS/net-tools.spec:1.85 --- SPECS/net-tools.spec:1.84 Tue Sep 11 21:48:11 2007 +++ SPECS/net-tools.spec Thu Sep 13 17:10:34 2007 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# TODO -# - check remaining patches Summary: Basic Networking Tools Summary(es.UTF-8): Herramientas básicas de Red Summary(ja.UTF-8): ネットワークをセットアップするための基本的なツール @@ -10,21 +8,22 @@ Summary(uk.UTF-8): Базові програми мережі Name: net-tools Version: 1.60 -Release: 18.1 +Release: 19 License: GPL Group: Networking/Admin Source0: http://download.berlios.de/net-tools/%{name}-%{version}.tar.bz2 # Source0-md5: 888774accab40217dde927e21979c165 Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: 9cee6ac0a07a0bf34fbc71add1eb2ead -Patch100: %{name}-branch.diff Patch0: %{name}-config.patch Patch1: %{name}-man.patch Patch2: %{name}-ipvs.patch Patch3: %{name}-et.patch + Patch5: %{name}-x25_address_is_struct.patch Patch6: %{name}-make_config_h.patch Patch7: %{name}-mii.patch +Patch8: %{name}-gcc34.patch Patch9: %{name}-nameif.patch Patch10: %{name}-inet6-lookup.patch Patch11: %{name}-ipx.patch @@ -36,7 +35,7 @@ Patch17: %{name}-interface.patch Patch18: %{name}-ifaceopt.patch Patch19: %{name}-netstat-overflow.patch -Patch20: %{name}-netstat-stat.patch +Patch20: %{name}-mii-tool-GigE.patch URL: http://net-tools.berlios.de/ BuildRequires: gettext-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -128,31 +127,31 @@ %prep %setup -q -%patch100 -p1 +%patch20 -p2 %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 -#%patch5 -p1 +%patch5 -p1 %patch6 -p1 -#%patch7 -p1 -#%patch9 -p1 -#%patch10 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 %patch11 -p1 -#%patch12 -p1 -#%patch13 -p1 +%patch12 -p1 +%patch13 -p1 %patch14 -p1 -#%patch15 -p1 -#%patch16 -p1 -#%patch17 -p1 -#%patch18 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 %patch19 -p1 -%patch20 -p1 mv po/et_EE.po po/et.po %build -%{__make} -j1 \ +%{__make} \ CC="%{__cc}" \ COPTS="%{rpmcflags} -Wall" \ I18N=1 @@ -161,7 +160,7 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_sysconfdir} -%{__make} install -j1 \ +%{__make} install \ BASEDIR=$RPM_BUILD_ROOT \ INSTALL="install" \ mandir=%{_mandir} \ @@ -192,8 +191,7 @@ %defattr(644,root,root,755) %doc READ* %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mactab -%attr(755,root,root) %{_bindir}/hostname -%attr(755,root,root) %{_bindir}/netstat +%attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_sbindir}/arp %attr(755,root,root) %{_sbindir}/ifconfig %attr(755,root,root) %{_sbindir}/mii-tool @@ -250,6 +248,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.85 2007/09/13 15:10:34 baggins +- rel 19 +- reverted bindir screwup (there are more files than just hostname and netstat) +- reverted branch diff (THIS package MUST work reliable all the times) + Revision 1.84 2007/09/11 19:48:11 glen - use branch diff ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/net-tools.spec?r1=1.84&r2=1.85&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
