From b1dfe6a45462ff95d71ca19ec52fe075636366dc Mon Sep 17 00:00:00 2001 From: Andy Lutomirski Date: Dec 20 2013 17:54:52 +0000 Subject: Revert "Retire fish." This reverts commit c4ab58961b34b5230bd0f380c151290b5b57431e. --- diff --git a/dead.package b/dead.package deleted file mode 100644 index 7dcad86..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -This package was retired due to no active owner on 2010-08-27 diff --git a/fish-1.23.0-ARG_MAX.patch b/fish-1.23.0-ARG_MAX.patch new file mode 100644 index 0000000..ffe48ae --- /dev/null +++ b/fish-1.23.0-ARG_MAX.patch @@ -0,0 +1,18 @@ +diff -up fish-1.23.0/exec.c.BAD fish-1.23.0/exec.c +--- fish-1.23.0/exec.c.BAD 2008-09-15 16:28:52.000000000 -0400 ++++ fish-1.23.0/exec.c 2008-09-15 16:29:56.000000000 -0400 +@@ -24,6 +24,14 @@ + #include + #include + ++#if defined(_SC_ARG_MAX) ++# if defined(ARG_MAX) ++# undef ARG_MAX ++# endif ++# define ARG_MAX sysconf (_SC_ARG_MAX) ++#endif ++ ++ + #ifdef HAVE_SIGINFO_H + #include + #endif diff --git a/fish.spec b/fish.spec new file mode 100644 index 0000000..fe09d53 --- /dev/null +++ b/fish.spec @@ -0,0 +1,212 @@ +Summary: A friendly interactive shell +Name: fish +Version: 1.23.1 +Release: 4%{?dist} +License: GPLv2 +Group: System Environment/Shells +URL: http://fishshell.org/ +Source0: http://fishshell.org/files/%{version}/fish-%{version}.tar.bz2 +# Emailed to upstream +Patch0: fish-1.23.0-ARG_MAX.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: ncurses-devel gettext groff doxygen +BuildRequires: autoconf + +%description +fish is a shell geared towards interactive use. Its features are +focused on user friendliness and discoverability. The language syntax +is simple but incompatible with other shell languages. + +%prep +%setup -q +%patch0 -p1 -b .ARG_MAX + +%build +# The docdir argument is to make the name of the documentation +# directory 'fish-VERSION', instead of the default, which is simply +# 'fish'. +%configure --without-xsel docdir=%{_datadir}/doc/%{name}-%{version} +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR="$RPM_BUILD_ROOT" + +# Find translation files +%find_lang %{name}.\* + +# In case... +mv $RPM_BUILD_ROOT%{_datadir}/fish/man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/ + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +# Add fish to the list of allowed shells in /etc/shells +if ! grep %{_bindir}/fish %{_sysconfdir}/shells >/dev/null; then + echo %{_bindir}/fish >>%{_sysconfdir}/shells +fi + +%postun +# Remove fish from the list of allowed shells in /etc/shells +if [ "$1" = 0 ]; then + grep -v %{_bindir}/fish %{_sysconfdir}/shells >%{_sysconfdir}/fish.tmp + mv %{_sysconfdir}/fish.tmp %{_sysconfdir}/shells +fi + +%files -f %{name}.\*.lang + +%defattr(-,root,root,-) +%doc %{_datadir}/doc/%{name}-%{version} +%{_mandir}/man1/*.1* +%exclude %{_mandir}/man1/count* +%exclude %{_mandir}/man1/alias* +%exclude %{_mandir}/man1/bg* +%exclude %{_mandir}/man1/bind* +%exclude %{_mandir}/man1/break* +%exclude %{_mandir}/man1/builtin* +%exclude %{_mandir}/man1/cd* +%exclude %{_mandir}/man1/command* +%exclude %{_mandir}/man1/complete* +%exclude %{_mandir}/man1/continue* +%exclude %{_mandir}/man1/dirs* +%exclude %{_mandir}/man1/eval* +%exclude %{_mandir}/man1/exec* +%exclude %{_mandir}/man1/exit* +%exclude %{_mandir}/man1/fg* +%exclude %{_mandir}/man1/help* +%exclude %{_mandir}/man1/jobs* +%exclude %{_mandir}/man1/popd* +%exclude %{_mandir}/man1/pushd* +%exclude %{_mandir}/man1/read* +%exclude %{_mandir}/man1/return* +%exclude %{_mandir}/man1/set* +%exclude %{_mandir}/man1/source* +%exclude %{_mandir}/man1/trap* +%exclude %{_mandir}/man1/type* +%exclude %{_mandir}/man1/ulimit* +%exclude %{_mandir}/man1/umask* +%attr(0755,root,root) %{_bindir}/fish +%attr(0755,root,root) %{_bindir}/fishd +%attr(0755,root,root) %{_bindir}/fish_pager +%attr(0755,root,root) %{_bindir}/fish_indent +%attr(0755,root,root) %{_bindir}/set_color +%attr(0755,root,root) %{_bindir}/mimedb +%config(noreplace) %{_sysconfdir}/fish +%{_datadir}/fish/ + +%changelog +* Fri Jul 24 2009 Fedora Release Engineering - 1.23.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Jul 03 2009 Lorenzo Villani - 1.23.1-3 +- Pass --without-xsel to configure, if you want xsel install its package instead +- Fix file list +- Drop unneeded BuildRequires + +* Fri Jul 03 2009 Lorenzo Villani - 1.23.1-2 +- rebuilt + +* Fri Jul 03 2009 Lorenzo Villani - 1.23.1-1 +- 1.23.1 +- Fix bz #472613 + +* Tue Feb 24 2009 Fedora Release Engineering - 1.23.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Sep 15 2008 Tom "spot" Callaway - 1.23.0-6 +- cleanups +- define ARG_MAX properly so it compiles + +* Mon Jul 07 2008 Tom "spot" Callaway - 1.23.0-5 +- fix conditional comparison + +* Fri Jul 06 2008 Oliver Falk - 1.23.0-4 +- Rebuild + +* Wed May 21 2008 Tom "spot" Callaway - 1.23.0-3 +- fix license tag + +* Mon Feb 18 2008 Fedora Release Engineering - 1.23.0-2 +- Autorebuild for GCC 4.3 + +* Mon Jan 14 2008 Oliver Falk - 1.23.0-1 +- Update to fix #208780 +- Remove openfix patch, included upstream now + +* Wed Oct 31 2007 Oliver Falk - 1.22.3-5 +- Fix glibc's open check, by providing mode, instead of working + around... + +* Wed Oct 31 2007 Oliver Falk - 1.22.3-4 +- Update URL; Fixes bz#359451 + +* Thu Aug 16 2007 Oliver Falk - 1.22.3-3 +- Workaround glibc's open check +- Problem reported upstream; Should be fixed there + +* Tue Aug 07 2007 Oliver Falk - 1.22.3-2 +- Fix BR autoconf + +* Tue Aug 07 2007 Oliver Falk - 1.22.3-1 +- Update; Bug #236868 +- Add missing doxygen BR + +* Fri Aug 4 2006 Axel Liljencrantz 1.21.10-4 +- Add better translation finding code from fedora spec to main spec. Thank you to Michael Schwendt. +- Add missing dependency libXext-devel. +- Remove one nesting level from dependency checking code. + +* Tue Aug 1 2006 Axel Liljencrantz 1.21.10-1 +- Improved the dependency check for X headers. Thank you to Michael Schwendt for pointers on how to do this + +* Mon Jul 31 2006 Axel Liljencrantz 1.21.10-1 +- Fixed spelling and punctuation as a per patch from Paul Howarth +- Fixed dependencies as per patch from Paul Howarth + +* Tue Nov 29 2005 Axel Liljencrantz 1.17.0-0 +- 1.17.0 + +* Sat Sep 24 2005 Axel Liljencrantz 1.14.0-0 +- 1.14.0 + +* Mon Sep 12 2005 Axel Liljencrantz 1.13.4-0 +- 1.13.4 + +* Wed Sep 07 2005 Axel Liljencrantz 1.13.3-0 +- 1.13.3 + +* Tue Sep 06 2005 Axel Liljencrantz 1.13.2-0 +- 1.13.2 + +* Fri Aug 30 2005 Axel Liljencrantz 1.13.1-0 +- 1.13.1 + +* Sun Aug 28 2005 Axel Liljencrantz 1.13.0-0 +- 1.13.0 + +* Sat Aug 13 2005 Axel Liljencrantz 1.13.0-0 +- Add completions subdirectory + +* Thu Jul 28 2005 Axel Liljencrantz 1.12.1-0 +- 1.12.1 + +* Fri Jul 15 2005 Axel Liljencrantz 1.12.0-1 +- 1.12.0 + +* Thu Jun 30 2005 Michael Schwendt 1.11.1-9 +- Set CFLAGS the proper way + +* Thu Jun 30 2005 Axel Liljencrantz 1.11.1-8 +- Fix revision number in changelog + +* Wed Jun 29 2005 Axel Liljencrantz 1.11.1-7 +- Send post-script output to /dev/null + +* Wed Jun 29 2005 Axel Liljencrantz 1.11.1-6 +- Add changelog section to spec file +- Add macros to source tags +- Add smp_mflags to 'make all' +- Fix typo in post install scriptlet test +- Set CFLAGS from spec file diff --git a/sources b/sources new file mode 100644 index 0000000..83cae90 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +ead6b7c6cdb21f35a3d4aa1d5fa596f1 fish-1.23.1.tar.bz2