X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fish.spec;h=20296af4b8fd00c24f1001d5c46203163424ff05;hb=94ada9d92da1d54815737a6a2f32e98384b9e4dd;hp=26b1df49522002a5801072d9c0c14f5d78ac04f5;hpb=83b8611873a6689b9e4728bafb5cc0b1c9bc6822;p=packages%2Ffish.git

diff --git a/fish.spec b/fish.spec
index 26b1df4..20296af 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,19 +1,19 @@
 Summary:	fish - A friendly interactive shell
 Summary(pl.UTF-8):	fish - przyjazna interaktywna powłoka
 Name:		fish
-Version:	2.1.1
+Version:	2.3.1
 Release:	1
 License:	GPL v2
 Group:		Applications/Shells
 Source0:	http://fishshell.com/files/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	0251e6e5f25d1f326e071425ea1dee22
+# Source0-md5:	2d13852a5c8e9e5bca00502b93e046a4
 URL:		http://fishshell.com/
-BuildRequires:	autoconf >= 2.50
+BuildRequires:	autoconf >= 2.60
 BuildRequires:	doxygen
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
 BuildRequires:	ncurses-devel
-Requires:	man-db
-Suggests:	xsel
+BuildRequires:	rpmbuild(macros) >= 1.462
+Suggests:	python
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -33,7 +33,8 @@ nie jest zgodna z innymi językami powłoki.
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
-%configure
+%configure \
+	--disable-silent-rules
 
 %{__make}
 
@@ -43,34 +44,52 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
+# no -devel package yet
+%{__rm} $RPM_BUILD_ROOT%{_npkgconfigdir}/fish.pc
 
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-umask 022
-if [ ! -f /etc/shells ]; then
-        echo "%{_bindir}/fish" >> /etc/shells
-else
-        grep -q '^%{_bindir}/fish$' /etc/shells || echo "%{_bindir}/fish" >> /etc/shells
-fi
+%post -p <lua>
+%lua_add_etc_shells %{_bindir}/fish
 
-%preun
-if [ "$1" = "0" ]; then
-        umask 022
-        grep -v '^%{_bindir}/fish$' /etc/shells > /etc/shells.new
-        mv -f /etc/shells.new /etc/shells
-fi
+%preun -p <lua>
+if arg[2] == 0 then
+	%lua_remove_etc_shells %{_bindir}/fish
+end
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc CHANGELOG README.md user_doc/html/*.{html,css,png}
-%attr(755,root,root) %{_bindir}/fish*
-%attr(755,root,root) %{_bindir}/mimedb
-%{_datadir}/%{name}
+%doc README.md user_doc/html/*.{html,css,png}
 %dir %{_sysconfdir}/fish
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fish/config.fish
-%{_mandir}/man1/fish*.1*
-%{_mandir}/man1/mimedb.1*
+%attr(755,root,root) %{_bindir}/fish
+%attr(755,root,root) %{_bindir}/fish_indent
+%attr(755,root,root) %{_bindir}/fish_key_reader
+%{_mandir}/man1/fish.1*
+%{_mandir}/man1/fish_indent.1*
+%{_mandir}/man1/fish_key_reader.1*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/config.fish
+%{_datadir}/%{name}/__fish_build_paths.fish
+%dir %{_datadir}/%{name}/completions
+%{_datadir}/%{name}/completions/..fish
+%{_datadir}/%{name}/completions/*.fish
+%{_datadir}/%{name}/vendor_completions.d
+%dir %{_datadir}/%{name}/functions
+%{_datadir}/%{name}/functions/*.fish
+%{_datadir}/%{name}/man
+%dir %{_datadir}/%{name}/tools
+%attr(755,root,root) %{_datadir}/%{name}/tools/create_manpage_completions.py
+%{_datadir}/%{name}/tools/deroff.py
+%dir %{_datadir}/%{name}/tools/web_config
+%{_datadir}/%{name}/tools/web_config/delete.png
+%{_datadir}/%{name}/tools/web_config/favicon.png
+%{_datadir}/%{name}/tools/web_config/fishconfig.css
+%{_datadir}/%{name}/tools/web_config/index.html
+%{_datadir}/%{name}/tools/web_config/js
+%{_datadir}/%{name}/tools/web_config/partials
+%{_datadir}/%{name}/tools/web_config/sample_prompts
+%attr(755,root,root) %{_datadir}/%{name}/tools/web_config/webconfig.py