Accepting request 176114 from home:Mailaender:branches:shells

cleanup and update

OBS-URL: https://build.opensuse.org/request/show/176114
OBS-URL: https://build.opensuse.org/package/show/shells/fish?expand=0&rev=2

configure.ac.patch

@@ -0,0 +1,11 @@
+--- configure.ac.orig	2013-05-17 09:41:21.000000000 +0200
++++ configure.ac	2013-05-18 10:02:19.512266684 +0200
+@@ -122,7 +122,7 @@ for i in /usr/pkg /sw /opt /opt/local /u
+   AC_MSG_CHECKING([for $i/lib library directory])
+   if test -d $i/lib; then
+     AC_MSG_RESULT(yes)
+-    LDFLAGS="$LDFLAGS -L$i/lib/ -Wl,-rpath,$i/lib/"
++    LDFLAGS="$LDFLAGS -L$i/lib/"
+   else
+     AC_MSG_RESULT(no)
+   fi

fish-1.23.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1ea3d6532226c315993fabd6096ec865fdcde4d43df9e26f9ed020e11e631f93
-size 876148

fish.changes

@@ -0,0 +1,10 @@
+-------------------------------------------------------------------
+Sat May 18 06:36:25 UTC 2013 - mailaender@opensuse.org
+
+- Update to version 2.0
+
+-------------------------------------------------------------------
+Sat Mar 28 00:00:00 UTC 2009 - bitshuffler #suse@irc.freenode.org
+
+- Initial RPM
+

fish.spec

@@ -1,59 +1,80 @@
-# norootforbuild
+#
+# spec file for package fish
+#
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
 
-%define jobs $(( `/usr/bin/getconf _NPROCESSORS_ONLN` + 1 ))
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
 
-Name:		fish
-Version:	1.23.1
-Release:	1.0
-License:	GNU GPL v2
-Group:		System/Shells
-Url:		http://www.fishshell.org/
-Source:		http://www.fishshell.org/files/%{version}/%{name}-%{version}.tar.bz2
-BuildRoot:	%{_tmppath}/%{name}-%{version}-build
-BuildRequires:	ncurses-devel xorg-x11-libXext-devel xorg-x11-libXt-devel
-Summary:	Fish, the friendly interactive shell
+Name:           fish
+Version:        2.0
+Release:        0
+License:        GPL-2.0
+Group:          System/Shells
+Url:            http://fishshell.com/
+Source:         http://fishshell.com/files/%{version}/%{name}.tar.gz
+#PATCH-FIX-OPENSUSE remove forbidden /usr/local/lib RPATH https://github.com/fish-shell/fish-shell/issues/766
+Patch0:         configure.ac.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  autoconf
+BuildRequires:  doxygen
+BuildRequires:  gcc-c++
+BuildRequires:  gettext
+BuildRequires:  groff
+BuildRequires:  python
+BuildRequires:  ncurses-devel
+Summary:        A user friendly interactive shell
 
 %description
 fish is a user friendly command line shell for UNIX-like operating systems such as Linux.
 
-It's geared towards interactive use and its features are focused on user friendlieness and discoverability. The language syntax is simple but incompatible with other shell languages.
-
-
-%define debug_package_requires %{name} = %{version}-%{release}
+It's geared towards interactive use and its features are focused on user friendlieness and
+discoverability. The language syntax is simple but incompatible with other shell languages.
 
 %prep
-%setup -q
+%setup -q -n %{name}
+%patch0 -p0
 
 %build
+autoconf
 %configure
-%__make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
-%makeinstall
-pushd %{buildroot}%{_datadir}/doc
-	set -- *
-	%__mkdir_p %{buildroot}%{_docdir}/%{name}
-	%__mv "$@" %{buildroot}%{_docdir}/%{name}
-popd
+make install DESTDIR=%{buildroot}
 %find_lang %{name}
-%__sed -i -e "s#%{_datadir}/doc#%{_docdir}/%{name}#" %{buildroot}%{_datadir}/%{name}/config.fish
+
 
 %post
-if [ -z "`grep %{_bindir}/fish /etc/shells`" ]; then
-	echo "%{_bindir}/fish" >> /etc/shells
+# Add fish to the list of allowed shells in /etc/shells
+if ! grep %{_bindir}/%{name} %{_sysconfdir}/shells >/dev/null; then
+	echo %{_bindir}/%{name} >>%{_sysconfdir}/shells
 fi
 
-%clean
-test "%{buildroot}" != "/" && %__rm -rf %{buildroot}
+%postun
+# Remove fish from the list of allowed shells in /etc/shells
+if [ "$1" = 0 ]; then
+	grep -v %{_bindir}/%{name} %{_sysconfdir}/shells >%{_sysconfdir}/%{name}.tmp
+	mv %{_sysconfdir}/%{name}.tmp %_sysconfdir/shells
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%config(noreplace) %{_sysconfdir}/fish
+%config(noreplace) %{_sysconfdir}/%{name}
 %{_bindir}/*
-%{_docdir}/fish
-%{_datadir}/fish
+%{_datadir}/doc/%{name}
+%{_datadir}/%{name}
+%{_datadir}/%{name}/completions
+%{_datadir}/%{name}/tools
 %{_mandir}/man1/*
 
-%changelog
-* Sat Mar 28 2009 bitshuffler #suse@irc.freenode.org
-- Initial RPM
+%changelog

fish.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e4c4a0b3c518769a3d31b235e743de7a8d52f851ad19d2df9d53534e6238303
+size 1540652