diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.in | 67 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | fish.spec.in | 221 |
4 files changed, 6 insertions, 285 deletions
@@ -18,7 +18,6 @@ doc_src/commands.hdr doc_src/index.hdr po/*.gmo fish -fish.spec fish_indent fish_pager fish_tests diff --git a/Makefile.in b/Makefile.in index 2b161607..6a336f74 100644 --- a/Makefile.in +++ b/Makefile.in @@ -20,14 +20,7 @@ # # Makefile for the fish shell. Can build fish and associated -# applications, install them, recalculate dependencies and also create -# binary distributions in tar.bz2, tar.gz and rpm formats. -# - -# -# The fish buildprocess is quite complex. Do not stare directly into -# the Makefile. Doing so may cause nausea, dizziness and -# hallucinations. +# applications, install them, and recalculate dependencies. # # Used by docdir @@ -186,48 +179,6 @@ HELP_SRC := $(wildcard doc_src/*.txt) TEST_IN := $(wildcard tests/test*.in) - -# -# Files that should be added to the tar archives -# - -# -# Files in ./doc_src/ -# - -DOC_SRC_DIR_FILES := $(HDR_FILES_SRC) $(HELP_SRC) - - -# -# Files in ./ -# - -MAIN_DIR_FILES_UNSORTED := Doxyfile Doxyfile.user Doxyfile.help \ - Makefile.in configure configure.ac config.h.in install-sh \ - key_reader.cpp $(MIME_OBJS:.o=.h) \ - $(MIME_OBJS:.o=.cpp) $(FISH_OBJS:.o=.h) $(BUILTIN_FILES) \ - $(COMMON_FILES) $(COMMON_FILES:.cpp=.h) $(FISH_OBJS:.o=.cpp) \ - fish.spec.in INSTALL README user_doc.head.html \ - ChangeLog config.sub config.guess fish_tests.cpp fish.cpp fish_pager.cpp \ - fishd.cpp make_vcs_completions.fish $(FISH_INDENT_OBJS:.o=.cpp) - -# -# The sorting is not meaningful in itself, but it has the side effect -# of removing duplicates, which means there will be fewer warnings -# during building. -# - -MAIN_DIR_FILES := $(sort $(MAIN_DIR_FILES_UNSORTED)) - - -# -# Files in ./tests/ -# - -TESTS_DIR_FILES := $(TEST_IN) $(TEST_IN:.in=.out) $(TEST_IN:.in=.err) \ - $(TEST_IN:.in=.status) tests/test.fish tests/gen_output.fish - - # # Files in ./share/completions/ # @@ -449,7 +400,7 @@ doc.h: $(HDR_FILES) # %.po:messages.pot - if test $(HAVE_GETTEXT) = 1;then \ + if test "$(HAVE_GETTEXT)" = 1;then \ if test -f $*.po; then \ msgmerge -U --backup=existing $*.po messages.pot;\ else \ @@ -463,7 +414,7 @@ doc.h: $(HDR_FILES) # messages.pot: *.cpp *.h share/completions/*.fish share/functions/*.fish - if test $(HAVE_GETTEXT) = 1;then \ + if test "$(HAVE_GETTEXT)" = 1; then \ xgettext -k_ -kN_ *.cpp *.h -o messages.pot; \ if xgettext -j -k_ -kN_ -k--description -LShell share/completions/*.fish share/functions/*.fish -o messages.pot; then true; else \ echo "Your xgettext version is too old to build the messages.pot file"\ @@ -714,7 +665,7 @@ uninstall-legacy: uninstall .PHONY: uninstall-legacy install-translations: $(TRANSLATIONS) - if test $(HAVE_GETTEXT) = 1; then \ + if test "$(HAVE_GETTEXT)" = 1; then \ for i in $(TRANSLATIONS); do \ $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/locale/`basename $$i .gmo`/LC_MESSAGES; \ $(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/locale/`basename $$i .gmo`/LC_MESSAGES/fish.mo; \ @@ -724,7 +675,7 @@ install-translations: $(TRANSLATIONS) .PHONY: install-translations uninstall-translations: - if test $(HAVE_GETTEXT) = 1; then \ + if test "$(HAVE_GETTEXT)" = 1; then \ for i in $(TRANSLATIONS_SRC); do \ rm -f $(DESTDIR)$(datadir)/locale/*/LC_MESSAGES/fish.mo; \ done; \ @@ -801,13 +752,6 @@ depend: .PHONY: depend # -# Build the RPM spec file. -# - -fish.spec: fish.spec.in - ./config.status - -# # Cleanup targets # @@ -816,7 +760,6 @@ fish.spec: fish.spec.in # distclean: clean - rm -f fish.spec rm -f config.status config.log config.h Makefile .PHONY: distclean diff --git a/configure.ac b/configure.ac index 82e591b2..64a6f1ec 100644 --- a/configure.ac +++ b/configure.ac @@ -873,7 +873,7 @@ case $target_os in esac # Tell the world what we know -AC_CONFIG_FILES([Makefile fish.spec]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT if test ! x$local_found_posix_switch = xyes; then diff --git a/fish.spec.in b/fish.spec.in deleted file mode 100644 index 0b57e96b..00000000 --- a/fish.spec.in +++ /dev/null @@ -1,221 +0,0 @@ -Summary: A friendly interactive shell -Name: @PACKAGE_NAME@ - -Version: @PACKAGE_VERSION@ -Release: 0%{?dist} - -License: GPL -Group: System Environment/Shells -URL: http://fishshell.com/ - -Source0: http://ridiculousfish.com/shell/files/%{version}/%{name}-%{version}.tar.bz2 - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel gettext groff - - -# Locate correct build time-dependencies for providing X headers -%if "%fedora" >= "5" - -# Modern Fedora version, has modular X.org -BuildRequires: xorg-x11-proto-devel libX11-devel libXt-devel libXext-devel - -%endif - -%if "%fedora" < "5" -%if "%fedora" >= "3" - -# Semi-old Fedora version, has non-modular X.org -BuildRequires: xorg-x11-devel - -%endif -%endif - -%if 0%{?fedora} -%if "%fedora" < "3" - -# Ancient Fedora version, has XFree86 -BuildRequires: XFree86-devel - -%endif -%else - -# The %fedora variable has not been correctly defined, or this is is -# not a Fedora system, try guessing BuildRequires by looking at the -# directory structure -%define xinclude /usr%(if [ -d /usr/X11R6/include ]; then echo /X11R6; fi)/include -BuildRequires: %{xinclude}/X11/StringDefs.h, %{xinclude}/X11/Xlib.h -BuildRequires: %{xinclude}/X11/Intrinsic.h, %{xinclude}/X11/Xatom.h - -%endif - - -%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 - - - - -%build -# The docdir argument is to make the name of the cosumantation -# directory 'fish-VERSION', instead of the default, which is simply -# 'fish'. -%configure 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}.\* - - - -%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,-) - -# The documentation directory -%doc %_datadir/doc/%{name}-%{version} - -# man files -%_mandir/man1/fish.1* -%_mandir/man1/fish_pager.1* -%_mandir/man1/fish_indent.1* -%_mandir/man1/fishd.1* -%_mandir/man1/mimedb.1* -%_mandir/man1/set_color.1* - -# The program binaries -%attr(0755,root,root) %_bindir/fish -%attr(0755,root,root) %_bindir/fish_indent -%attr(0755,root,root) %_bindir/fish_pager -%attr(0755,root,root) %_bindir/fishd -%attr(0755,root,root) %_bindir/mimedb -%attr(0755,root,root) %_bindir/set_color - -# Configuration files -%config %_sysconfdir/fish/config.fish -%dir %_sysconfdir/fish - -# Non-configuration initialization files -%dir %_datadir/fish -%_datadir/fish/config.fish - -# Program specific tab-completions -%dir %_datadir/fish/completions -%_datadir/fish/completions/*.fish - -# Dynamically loaded shellscript functions -%dir %_datadir/fish/functions -%_datadir/fish/functions/*.fish - -# Documentation for builtins and shellscript functions -%dir %_datadir/fish/man -%_datadir/fish/man/*.1 - - - -%changelog -* Sat Apr 21 2007 Axel Liljencrantz<axel@liljencrantz.se> 1.23.0-0 -- Add fish_indent command - -* Thu Feb 8 2007 Axel Liljencrantz<axel@liljencrantz.se> 1.22.3-0 -- Tell rpm about the help pages in %_datadir/fish/man/ - -* Sat Oct 14 2006 Axel Liljencrantz<axel@liljencrantz.se> 1.22.0-0 -- Update names of various configuration files - -* Fri Aug 4 2006 Axel Liljencrantz<axel@liljencrantz.se> 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<axel@liljencrantz.se> 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<axel@liljencrantz.se> 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 <axel@liljencrantz.se> 1.17.0-0 -- 1.17.0 - -* Sat Sep 24 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.14.0-0 -- 1.14.0 - -* Mon Sep 12 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.4-0 -- 1.13.4 - -* Wed Sep 07 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.3-0 -- 1.13.3 - -* Tue Sep 06 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.2-0 -- 1.13.2 - -* Fri Aug 30 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.1-0 -- 1.13.1 - -* Sun Aug 28 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.0-0 -- 1.13.0 - -* Sat Aug 13 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.0-0 -- Add completions subdirectory - -* Thu Jul 28 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.12.1-0 -- 1.12.1 - -* Fri Jul 15 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.12.0-1 -- 1.12.0 - -* Thu Jun 30 2005 Michael Schwendt <mschwendt@users.sf.net> 1.11.1-9 -- Set CFLAGS the proper way - -* Thu Jun 30 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.11.1-8 -- Fix revision number in changelog - -* Wed Jun 29 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.11.1-7 -- Send post-script output to /dev/null - -* Wed Jun 29 2005 Axel Liljencrantz <axel@liljencrantz.se> 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 |