packages: net-tools/net-tools.spec - rel 32; hostname/domainname tools in s...

[arekm]

Author: arekm                        Date: Fri Feb 11 07:30:15 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 32; hostname/domainname tools in separate hostname.spec

---- Files affected:
packages/net-tools:
   net-tools.spec (1.92 -> 1.93) 

---- Diffs:

================================================================
Index: packages/net-tools/net-tools.spec
diff -u packages/net-tools/net-tools.spec:1.92 packages/net-tools/net-tools.spec:1.93
--- packages/net-tools/net-tools.spec:1.92	Tue Dec  1 12:01:28 2009
+++ packages/net-tools/net-tools.spec	Fri Feb 11 08:30:10 2011
@@ -10,7 +10,7 @@
 Summary(uk.UTF-8):	Базові програми мережі
 Name:		net-tools
 Version:	1.60
-Release:	30
+Release:	32
 License:	GPL
 Group:		Networking/Admin
 Source0:	http://download.berlios.de/net-tools/%{name}-%{version}.tar.bz2
@@ -41,6 +41,7 @@
 Patch21:	%{name}-statistics_buffer.patch
 URL:		http://net-tools.berlios.de/
 BuildRequires:	gettext-devel
+Requires:	hostname
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_bindir		/bin
@@ -158,7 +159,7 @@
 %build
 %{__make} -j1 \
 	CC="%{__cc}" \
-	COPTS="%{rpmcflags} -Wall" \
+	COPTS="%{rpmcppflags} %{rpmcflags} -Wall" \
 	I18N=1
 
 %install
@@ -182,6 +183,18 @@
 # we can do it safely as no pt/pt_PT man pages appeared here yet
 mv $RPM_BUILD_ROOT%{_mandir}/{pt_BR,pt}
 
+ #remove hostname (has its own package)
+rm $RPM_BUILD_ROOT/bin/dnsdomainname
+rm $RPM_BUILD_ROOT%{_mandir}/{,*/}man*/dnsdomainname*
+rm $RPM_BUILD_ROOT/bin/domainname
+rm $RPM_BUILD_ROOT%{_mandir}/{,*/}man*/domainname*
+rm $RPM_BUILD_ROOT/bin/hostname
+rm $RPM_BUILD_ROOT%{_mandir}/{,*/}man*/hostname*
+rm $RPM_BUILD_ROOT/bin/nisdomainname
+rm $RPM_BUILD_ROOT%{_mandir}/{,*/}man*/nisdomainname*
+rm $RPM_BUILD_ROOT/bin/ypdomainname
+rm $RPM_BUILD_ROOT%{_mandir}/{,*/}man*/ypdomainname*
+
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/mactab <<EOF
 # Each line here contains an interface name and a Ethernet MAC address. Like:
 #lan 00:13:d3:05:15:d2
@@ -208,23 +221,23 @@
 %lang(de) %{_mandir}/de/man8/[!ps]*
 %lang(es) %{_mandir}/es/man[15]/*
 %lang(es) %{_mandir}/es/man8/[!ps]*
-%lang(fi) %{_mandir}/fi/man[15]/*
+#%lang(fi) %{_mandir}/fi/man[15]/*
 # No fi man8
 %lang(fr) %{_mandir}/fr/man[15]/*
 %lang(fr) %{_mandir}/fr/man8/[!ps]*
-%lang(hu) %{_mandir}/hu/man[15]/*
+#%lang(hu) %{_mandir}/hu/man[15]/*
 %lang(hu) %{_mandir}/hu/man8/[!ps]*
-%lang(id) %{_mandir}/id/man[15]/*
+#%lang(id) %{_mandir}/id/man[15]/*
 %lang(id) %{_mandir}/id/man8/[!ps]*
-%lang(it) %{_mandir}/it/man[15]/*
+#%lang(it) %{_mandir}/it/man[15]/*
 %lang(it) %{_mandir}/it/man8/[!ps]*
 %lang(ja) %{_mandir}/ja/man[15]/*
 %lang(ja) %{_mandir}/ja/man8/[!ps]*
 # No nl man[15]
 %lang(nl) %{_mandir}/nl/man8/[!ps]*
-%lang(pt) %{_mandir}/pt/man[15]/*
+#%lang(pt) %{_mandir}/pt/man[15]/*
 %lang(pt) %{_mandir}/pt/man8/[!ps]*
-%lang(pl) %{_mandir}/pl/man[15]/*
+#%lang(pl) %{_mandir}/pl/man[15]/*
 %lang(pl) %{_mandir}/pl/man8/[!ps]*
 
 %{_mandir}/man[15]/*
@@ -253,6 +266,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.93  2011/02/11 07:30:10  arekm
+- rel 32; hostname/domainname tools in separate hostname.spec
+
 Revision 1.92  2009/12/01 11:01:28  baggins
 - rel 30
 - fix buffer for newer kernels
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-tools/net-tools.spec?r1=1.92&r2=1.93&f=u