rpms/fish/F-10 fish.spec,1.28,1.29

arbiter arbiter at fedoraproject.org
Fri Jul 3 13:39:57 UTC 2009


Author: arbiter

Update of /cvs/pkgs/rpms/fish/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30734

Modified Files:
	fish.spec 
Log Message:
fix


Index: fish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fish/F-10/fish.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- fish.spec	3 Jul 2009 13:27:50 -0000	1.28
+++ fish.spec	3 Jul 2009 13:39:57 -0000	1.29
@@ -9,10 +9,8 @@ Source0:                http://fishshell
 # Emailed to upstream
 Patch0:                 fish-1.23.0-ARG_MAX.patch
 BuildRoot:              %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:               xsel
 BuildRequires:          ncurses-devel gettext groff doxygen
 BuildRequires:          autoconf
-BuildRequires:          xorg-x11-proto-devel libX11-devel libXt-devel libXext-devel
 
 %description
 fish is a shell geared towards interactive use. Its features are
@@ -27,7 +25,7 @@ is simple but incompatible with other sh
 # The docdir argument is to make the name of the documentation
 # directory 'fish-VERSION', instead of the default, which is simply
 # 'fish'.
-%configure docdir=%{_datadir}/doc/%{name}-%{version}
+%configure --without-xsel docdir=%{_datadir}/doc/%{name}-%{version}
 make %{?_smp_mflags}
 
 
@@ -62,7 +60,6 @@ fi
 %defattr(-,root,root,-)
 %doc %{_datadir}/doc/%{name}-%{version}
 %{_mandir}/man1/*.1*
-%exclude %{_bindir}/xsel
 %exclude %{_mandir}/man1/count*
 %exclude %{_mandir}/man1/alias*
 %exclude %{_mandir}/man1/bg*
@@ -90,7 +87,6 @@ fi
 %exclude %{_mandir}/man1/type*
 %exclude %{_mandir}/man1/ulimit*
 %exclude %{_mandir}/man1/umask*
-%exclude %{_mandir}/man1/xsel*
 %attr(0755,root,root) %{_bindir}/fish
 %attr(0755,root,root) %{_bindir}/fishd
 %attr(0755,root,root) %{_bindir}/fish_pager
@@ -102,8 +98,9 @@ fi
 
 %changelog
 * Fri Jul 03 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.23.1-3
+- Pass --without-xsel to configure, if you want xsel install its package instead
 - Fix file list
-- Don't use own copy of xsel
+- Drop unneeded BuildRequires
 
 * Fri Jul 03 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.23.1-2
 - rebuilt




More information about the fedora-extras-commits mailing list