diff --git a/time-1.7-destdir.patch b/time-1.7-destdir.patch new file mode 100644 index 0000000..926ee77 --- /dev/null +++ b/time-1.7-destdir.patch @@ -0,0 +1,37 @@ +--- 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: diff --git a/time.spec b/time.spec index 411f2fe..c8a809d 100644 --- a/time.spec +++ b/time.spec @@ -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 @@ the results. %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 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 - add dist tag - fix rhbz#223720