rpms/time/devel time-1.7-destdir.patch, NONE, 1.1 time.spec, 1.18, 1.19

[fedora-cvs-commits at redhat.com]

Author: karsten

Update of /cvs/dist/rpms/time/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9830

Modified Files:
	time.spec 
Added Files:
	time-1.7-destdir.patch 
Log Message:
- remove trailing dot from summary
- replace tabs with spaces
- replace PreReq with Requires(post)/Requires(preun)
- include license file in %%doc
- add smp flags
- use make install DESTDIR=



time-1.7-destdir.patch:
 Makefile.in |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE time-1.7-destdir.patch ---
--- time-1.7/Makefile.in.destdir	2007-02-27 12:13:10.000000000 +0100
+++ time-1.7/Makefile.in	2007-02-27 12:18:07.000000000 +0100
@@ -114,10 +114,10 @@
 maintainer-clean-binPROGRAMS:
 
 install-binPROGRAMS: $(bin_PROGRAMS)
-	$(mkinstalldirs) $(bindir)
+	$(mkinstalldirs) $(DESTDIR)/$(bindir)
 	list="$(bin_PROGRAMS)"; for p in $$list; do \
 	  if test -f $$p; then \
-	    $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
+	    $(INSTALL_PROGRAM) $$p $(DESTDIR)/$(bindir)/`echo $$p|sed '$(transform)'`; \
 	  else :; fi; \
 	done
 
@@ -176,10 +176,10 @@
 	TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
 
 install-info: $(INFO_DEPS)
-	$(mkinstalldirs) $(infodir)
+	$(mkinstalldirs) $(DESTDIR)/$(infodir)
 	for file in $(INFO_DEPS); do		\
 	  for ifile in `cd $(srcdir) && echo $$file*`; do \
-	    $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
+	    $(INSTALL_DATA) $(srcdir)/$$ifile $(DESTDIR)/$(infodir)/$$ifile; \
 	  done;					\
 	done
 
@@ -279,7 +279,7 @@
 install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 installdirs:
-	$(mkinstalldirs)  $(bindir) $(infodir)
+	$(mkinstalldirs)  $(DESTDIR)/$(bindir) $(DESTDIR)/$(infodir)
 
 
 mostlyclean-generic:


Index: time.spec
===================================================================
RCS file: /cvs/dist/rpms/time/devel/time.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- time.spec	22 Jan 2007 13:06:26 -0000	1.18
+++ time.spec	27 Feb 2007 11:26:57 -0000	1.19
@@ -1,13 +1,14 @@
-Summary: A GNU utility for monitoring a program's use of system resources.
+Summary: A GNU utility for monitoring a program's use of system resources
 Name: time
 Version: 1.7
-Release: 28%{?dist}
+Release: 29%{?dist}
 License: GPL
 Group: Applications/System
 Source: ftp://prep.ai.mit.edu/pub/gnu/%{name}/%{name}-%{version}.tar.gz
-Prefix: %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-root
-Prereq: /sbin/install-info
+Patch:  time-1.7-destdir.patch
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description
 The GNU time utility runs another program, collects information about
@@ -16,38 +17,45 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 echo "ac_cv_func_wait3=\${ac_cv_func_wait3='yes'}" >> config.cache
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf %{buildroot}
 
 %post
 /sbin/install-info %{_infodir}/time.info.gz %{_infodir}/dir \
-	--entry="* time: (time).		GNU time Utility" 
-exit 0
+    --entry="* time: (time).        GNU time Utility" || :
 
 %preun
 if [ "$1" = 0 ]; then
     /sbin/install-info --delete %{_infodir}/time.info.gz %{_infodir}/dir \
-	--entry="* time: (time).		GNU time Utility" 
+    --entry="* time: (time).        GNU time Utility" || :
 fi
-exit 0
 
 %files
-%defattr(-,root,root)
-%doc NEWS README
+%defattr(-,root,root,-)
+%doc NEWS README COPYING
 %{_bindir}/time
 %{_infodir}/time.info*
 
 %changelog
+* Tue Feb 27 2007 Karsten Hopp <karsten at redhat.com> 1.7-29
+- remove trailing dot from summary
+- replace tabs with spaces
+- replace PreReq with Requires(post)/Requires(preun)
+- include license file in %%doc
+- add smp flags
+- use make install DESTDIR=
+
 * Mon Jan 22 2007 Florian La Roche <laroche at redhat.com>
 - add dist tag
 - fix rhbz#223720