From c27ab4eba62234ecb246e04ceaf41ce024539eeef4d86532357211ef0af59c25 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 23 Mar 2015 10:30:38 +0000
Subject: [PATCH] Accepting request 292342 from
 home:AndreasStieger:branches:Base:System

GNU which 2.21

OBS-URL: https://build.opensuse.org/request/show/292342
OBS-URL: https://build.opensuse.org/package/show/Base:System/which?expand=0&rev=3
---
 which-2.20.tar.bz2 |  3 ---
 which-2.21.tar.gz  |  3 +++
 which.changes      | 10 ++++++++++
 which.spec         | 29 ++++++++++++++---------------
 4 files changed, 27 insertions(+), 18 deletions(-)
 delete mode 100644 which-2.20.tar.bz2
 create mode 100644 which-2.21.tar.gz

diff --git a/which-2.20.tar.bz2 b/which-2.20.tar.bz2
deleted file mode 100644
index f10b8ce..0000000
--- a/which-2.20.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:33ca01bb3d801338e4a464367d74eaab24f87041c44c9b5e1150393f1744a3a0
-size 107758
diff --git a/which-2.21.tar.gz b/which-2.21.tar.gz
new file mode 100644
index 0000000..7e7120d
--- /dev/null
+++ b/which-2.21.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad
+size 149305
diff --git a/which.changes b/which.changes
index cbdbaf2..8f50ffa 100644
--- a/which.changes
+++ b/which.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Mar 22 18:10:34 UTC 2015 - astieger@suse.com
+
+- GNU which 2.21:
+  * Upgraded code from bash to version 4.3 (now uses eaccess).
+  * Fixed a bug related to getgroups / sysconfig that caused Which
+    not to see more than 64 groups for a single user
+  * Build system maintenance.
+- Update project and source URL to GNU project
+
 -------------------------------------------------------------------
 Sun Jan 20 19:24:06 UTC 2013 - jengelh@inai.de
 
diff --git a/which.spec b/which.spec
index aa86545..b9c45d4 100644
--- a/which.spec
+++ b/which.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package which
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,18 +17,17 @@
 
 
 Name:           which
-Version:        2.20
+Version:        2.21
 Release:        0
 Summary:        Displays where a particular program in your path is located
 License:        GPL-3.0+
 Group:          System/Base
-Url:            http://carlo17.home.xs4all.nl/which/
-
-#DL-URL:	http://carlo17.home.xs4all.nl/which/%name-%version.tar.gz
-Source:         %name-%version.tar.bz2
+Url:            https://savannah.gnu.org/projects/which/
+Source:         http://ftp.gnu.org/pub/gnu/%{name}/%{name}-%{version}.tar.gz
+# FIXME: use proper Requires(pre/post/preun/...)
+PreReq:         %{install_info_prereq}
+Provides:       util-linux:%{_bindir}/which
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-PreReq:		%install_info_prereq
-Provides:       util-linux:/usr/bin/which
 
 %description
 The which command shows the full pathname of a specified program, if
@@ -42,19 +41,19 @@ the specified program is in your PATH.
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR="%buildroot"
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
 %post
-%install_info --info-dir="%_infodir" "%_infodir/which.info.gz"
+%install_info --info-dir="%{_infodir}" "%{_infodir}/which.info.gz"
 
 %postun
-%install_info_delete --info-dir="%_infodir" "%_infodir/which.info.gz"
+%install_info_delete --info-dir="%{_infodir}" "%{_infodir}/which.info.gz"
 
 %files
 %defattr(-,root,root)
-%_bindir/which
-%doc EXAMPLES COPYING README README.alias
-%_infodir/which.info*
-%_mandir/man1/which.1*
+%{_bindir}/which
+%doc EXAMPLES COPYING README README.alias AUTHORS NEWS
+%{_infodir}/which.info*
+%{_mandir}/man1/which.1*
 
 %changelog