diff --git a/which-2.14-broken.patch b/which-2.14-broken.patch new file mode 100644 index 0000000..c0b3911 --- /dev/null +++ b/which-2.14-broken.patch @@ -0,0 +1,33 @@ +--- which-2.14/tilde/tilde.c.orig Mon Dec 9 18:52:19 2002 ++++ which-2.14/tilde/tilde.c Mon Dec 9 18:58:09 2002 +@@ -182,7 +182,10 @@ + int result_size, result_index; + + result_index = result_size = 0; +- if (result = strchr (string, '~')) ++ ++ result = strchr (string, '~'); ++ ++ if (!result) + result = xmalloc (result_size = (strlen (string) + 16)); + else + result = xmalloc (result_size = (strlen (string) + 1)); +--- which-2.14/which.c.orig Mon Dec 9 18:58:28 2002 ++++ which-2.14/which.c Mon Dec 9 18:59:52 2002 +@@ -22,6 +22,7 @@ + #include "getopt.h" + #include "tilde/tilde.h" + #include "bash.h" ++#include + + static const char *progname; + +@@ -536,7 +537,7 @@ + while (fgets(buf, sizeof(buf), stdin)) + { + int looks_like_function_start = 0; +- int function_start_version_205b; ++ int function_start_version_205b = 0; + if (read_functions) + { + // bash version 2.0.5a and older output a pattern for `str' like diff --git a/which.spec b/which.spec new file mode 100644 index 0000000..783e035 --- /dev/null +++ b/which.spec @@ -0,0 +1,152 @@ +Summary: Displays where a particular program in your path is located. +Name: which +Version: 2.14 +Release: 5 +License: GPL +Group: Applications/System +Source0: ftp://ftp.gnu.org/gnu/which/%{name}-%{version}.tar.gz +Source1: which-2.sh + +Patch: which-2.13-afs.patch +Patch1: which-2.14-broken.patch + +Prefix: %{_prefix} + +Buildroot: %{_tmppath}/%{name}-root + +Prereq: /sbin/install-info + +%description +The which command shows the full pathname of a specified program, if +the specified program is in your PATH. + +%prep +%setup -q +%patch -p1 -b .afs +%patch1 -p1 -b .broken + +%build +%configure +make + +%install +rm -rf $RPM_BUILD_ROOT + +%makeinstall +mkdir -p $RPM_BUILD_ROOT/etc/profile.d +install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/profile.d + +%post +/sbin/install-info --quiet --info-dir=%{_infodir} %{_infodir}/which.info.gz > /dev/null 2>&1 + +if [ $1 = 0 ]; then + /sbin/install-info --quiet --info-dir=%{_infodir} --delete %{_infodir}/which.info.gz > /dev/null 2>&1 +fi + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc EXAMPLES README +%{_bindir}/* +%config /etc/profile.d/which-2.* +%{_infodir}/which.info.gz +%{_mandir}/*/* + +%changelog +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Dec 10 2002 Than Ngo 2.14-4 +- cleanup code (bug #78478) + +* Thu Nov 14 2002 Tim Powers 2.14-3 +- redirect info dir warnings to /dev/null + +* Thu Nov 7 2002 Than Ngo 2.14-1 +- add missing info file + +* Mon Jul 29 2002 Florian La Roche +- update to 2.14 wih better support for current bash + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Feb 27 2002 Than Ngo 2.13-3 +- use access instead stat in AFS environment (bug #60353) + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Wed Dec 05 2001 Florian La Roche +- update to 2.13 + +* Sat Aug 4 2001 Than Ngo +- fix bug 50844 + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Sun Sep 10 2000 Florian La Roche +- 2.12 (only man-page fix) + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Sun Jun 18 2000 Than Ngo +- FHS packaging. + +* Sun May 21 2000 Ngo Than +- put man pages in /usr/share/man/* + +* Thu Apr 20 2000 Florian La Roche +- update to 2.11 +- change from root:bin -> root:root + +* Mon Feb 07 2000 Preston Brown +- rebuild to gzip man page + +* Sun Jan 16 2000 Preston Brown +- newer stuff rom Carlo (2.10). Author's email: carlo@gnu.org + +* Thu Jan 13 2000 Preston Brown +- adopted Carlo's specfile. + +* Fri Sep 24 1999 Carlo Wood +- There should not be a reason anymore to include README.alias in the rpm docs. +- Don't install as root.root in RPM_BUILD_ROOT, in order to allow to build + rpm as non-root. +- Bug fix +- Added /etc/profile.d for automatic alias inclusion. + +* Wed Aug 25 1999 Carlo Wood +- Added README.alias. + +* Wed Aug 11 1999 Carlo Wood +- Typo in comment. + +* Thu May 27 1999 Carlo Wood +- Typo fix +- Moved maintainer targets from makefile to Makefile.am. + +* Tue May 18 1999 Carlo Wood +- Typo in appended changelog. +- Appended the old change log of `which-2.0.spec' to (this) changelog, + which is generated from the CVS log of `which-2.0.spec.in'. +- Generate which-2.spec from which-2.spec.in with automatic VERSION + and CHANGELOG substitution. + +* Tue May 14 1999 Carlo Wood +- Moved assignment of CFLAGS to the configure line, using RPM_OPT_FLAGS now. +- Corrected Source: line to point to ftp.gnu.org. + +* Sat Apr 17 1999 Carlo Wood +- Started to use automake and autoconf + +* Fri Apr 09 1999 Carlo Wood +- Renamed which-2.0.spec to which-2.spec +