rpms/iputils/devel iputils.spec,1.52,1.53 sources,1.15,1.16

[Martin Nagy (mnagy)]

Author: mnagy

Update of /cvs/extras/rpms/iputils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13520

Modified Files:
	iputils.spec sources 
Log Message:
* Mon Jan 14 2008 Martin Nagy <mnagy at redhat.com> - 20070202-6
- fix absolute symlinks and character encoding for RELNOTES (#225909)
- preserve file timestamps (#225909)
- use %{?_smp_mflags} (#225909)
- fix service rdisc stop removing of lock file



Index: iputils.spec
===================================================================
RCS file: /cvs/extras/rpms/iputils/devel/iputils.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- iputils.spec	14 Jan 2008 15:26:10 -0000	1.52
+++ iputils.spec	15 Jan 2008 14:10:57 -0000	1.53
@@ -28,6 +28,7 @@
 BuildRequires: libidn-devel
 Requires(post): chkconfig
 Requires(preun): chkconfig
+Requires(postun): /sbin/service
 
 %description
 The iputils package contains basic utilities for monitoring a network,
@@ -58,7 +59,7 @@
 export CFLAGS="$RPM_OPT_FLAGS -fpie"
 %endif
 export LDFLAGS="-pie"
-make
+make %{?_smp_mflags}
 gcc -Wall $RPM_OPT_FLAGS ifenslave.c -o ifenslave
 make -C doc man
 
@@ -69,19 +70,19 @@
 mkdir -p ${RPM_BUILD_ROOT}/{bin,sbin}
 install -c clockdiff		${RPM_BUILD_ROOT}%{_sbindir}/
 %ifos linux
-install -c arping		${RPM_BUILD_ROOT}/sbin/
+install -cp arping		${RPM_BUILD_ROOT}/sbin/
 ln -s /sbin/arping		${RPM_BUILD_ROOT}%{_sbindir}/arping
-install -c ping			${RPM_BUILD_ROOT}/bin/
-install -c ifenslave		${RPM_BUILD_ROOT}/sbin/
+install -cp ping		${RPM_BUILD_ROOT}/bin/
+install -cp ifenslave		${RPM_BUILD_ROOT}/sbin/
 %else
-install -c arping		${RPM_BUILD_ROOT}%{_sbindir}/
-install -c ping			${RPM_BUILD_ROOT}%{_sbindir}/
-install -c ifenslave		${RPM_BUILD_ROOT}%{_sbindir}/
+install -cp arping		${RPM_BUILD_ROOT}%{_sbindir}/
+install -cp ping		${RPM_BUILD_ROOT}%{_sbindir}/
+install -cp ifenslave		${RPM_BUILD_ROOT}%{_sbindir}/
 %endif
-install -c rdisc		${RPM_BUILD_ROOT}/sbin/
-install -c ping6		${RPM_BUILD_ROOT}/bin/
-install -c tracepath		${RPM_BUILD_ROOT}/bin/
-install -c tracepath6		${RPM_BUILD_ROOT}/bin/
+install -cp rdisc		${RPM_BUILD_ROOT}/sbin/
+install -cp ping6		${RPM_BUILD_ROOT}/bin/
+install -cp tracepath		${RPM_BUILD_ROOT}/bin/
+install -cp tracepath6		${RPM_BUILD_ROOT}/bin/
 
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 ln -sf /bin/ping6 ${RPM_BUILD_ROOT}%{_sbindir}
@@ -89,17 +90,17 @@
 ln -sf /bin/tracepath6 ${RPM_BUILD_ROOT}%{_sbindir}
 
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
-install -c doc/clockdiff.8	${RPM_BUILD_ROOT}%{_mandir}/man8/
-install -c doc/arping.8		${RPM_BUILD_ROOT}%{_mandir}/man8/
-install -c doc/ping.8		${RPM_BUILD_ROOT}%{_mandir}/man8/
-install -c doc/rdisc.8		${RPM_BUILD_ROOT}%{_mandir}/man8/
-install -c doc/tracepath.8	${RPM_BUILD_ROOT}%{_mandir}/man8/
-install -c ifenslave.8		${RPM_BUILD_ROOT}%{_mandir}/man8/
+install -cp doc/clockdiff.8	${RPM_BUILD_ROOT}%{_mandir}/man8/
+install -cp doc/arping.8	${RPM_BUILD_ROOT}%{_mandir}/man8/
+install -cp doc/ping.8		${RPM_BUILD_ROOT}%{_mandir}/man8/
+install -cp doc/rdisc.8		${RPM_BUILD_ROOT}%{_mandir}/man8/
+install -cp doc/tracepath.8	${RPM_BUILD_ROOT}%{_mandir}/man8/
+install -cp ifenslave.8		${RPM_BUILD_ROOT}%{_mandir}/man8/
 ln -s ping.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/ping6.8.gz
 ln -s tracepath.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/tracepath6.8.gz
 
-install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
-install -m 755 %SOURCE3 ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/rdisc
+install -dp ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
+install -m 755 -p %SOURCE3 ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/rdisc
 
 iconv -f ISO88591 -t UTF8 RELNOTES -o RELNOTES.tmp
 mv -f RELNOTES.tmp RELNOTES
@@ -152,6 +153,9 @@
 %changelog
 * Mon Jan 14 2008 Martin Nagy <mnagy at redhat.com> - 20070202-6
 - fix absolute symlinks and character encoding for RELNOTES (#225909)
+- preserve file timestamps (#225909)
+- use %%{?_smp_mflags} (#225909)
+- fix service rdisc stop removing of lock file
 
 * Fri Sep 14 2007 Martin Bacovsky <mbacovsk at redhat.com> - 20070202-5
 - rebuild


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/iputils/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	7 Aug 2007 09:14:36 -0000	1.15
+++ sources	15 Jan 2008 14:10:57 -0000	1.16
@@ -1,3 +1,3 @@
 1d38fb3cfc2b71496e43cf646bfc1d6e  iputils-s20070202.tar.bz2
-3d892612fea39310ee054f59f3931132  rdisc.initd
+b044213f027e70a2cc1aa882e21fba3b  rdisc.initd
 9071449369f52f374faf40811b1669ed  ifenslave.tar.gz