added new patch for EL7 build

epel9
Oliver Haessler 9 years ago
parent 55bbbd95b5
commit 144e41997f

@ -1,6 +1,6 @@
Name: fish Name: fish
Version: 2.2.0 Version: 2.2.0
Release: 5%{?dist} Release: 6%{?dist}
Summary: A friendly interactive shell Summary: A friendly interactive shell
Group: System Environment/Shells Group: System Environment/Shells
@ -11,10 +11,14 @@ Source0: http://fishshell.com/files/%{version}/fish-%{version}.ta
Patch0: fish-use-usrbinpython3.patch Patch0: fish-use-usrbinpython3.patch
# Pull request #2393, hopefully fixing #2392 / rhbz #1263052 # Pull request #2393, hopefully fixing #2392 / rhbz #1263052
Patch1: pr-2393-1.patch Patch1: pr-2393-1.patch
Patch2: pr-2393-2.patch Patch2: pr-2393-2.patch
BuildRequires: python3-devel %if 0%{?rhel}
BuildRequires: python34-devel
%else
BuildRequires: python3-devel
%endif
%global __python %{__python3} %global __python %{__python3}
BuildRequires: ncurses-devel gettext groff doxygen BuildRequires: ncurses-devel gettext groff doxygen
@ -31,6 +35,9 @@ nothing to learn or configure.
%patch0 -p1 %patch0 -p1
%patch1 -p2 %patch1 -p2
%patch2 -p2 %patch2 -p2
%if 0%{?rhel}
%patch3 -p2
%endif
# This is unused. If we fiddle with Python versions, its presence will # This is unused. If we fiddle with Python versions, its presence will
# be confusing. # be confusing.
@ -38,7 +45,7 @@ rm create_wajig_completions.py
%build %build
%configure --docdir=%{_docdir}/%{name} %configure --docdir=%{_pkgdocdir}
make %{?_smp_mflags} all fish_tests make %{?_smp_mflags} all fish_tests
@ -55,8 +62,8 @@ gzip %{buildroot}%{_datadir}/fish/man/man1/*.1
rm %{buildroot}/usr/share/pkgconfig/fish.pc rm %{buildroot}/usr/share/pkgconfig/fish.pc
# Install docs from tarball root # Install docs from tarball root
cp README.md %{buildroot}%{_docdir}/%{name} cp README.md %{buildroot}%{_pkgdocdir}
cp CONTRIBUTING.md %{buildroot}%{_docdir}/%{name} cp CONTRIBUTING.md %{buildroot}%{_pkgdocdir}
%check %check
@ -90,10 +97,13 @@ fi
%{_bindir}/* %{_bindir}/*
%config(noreplace) %{_sysconfdir}/fish %config(noreplace) %{_sysconfdir}/fish
%{_datadir}/fish/ %{_datadir}/fish/
%{_docdir}/%{name} %{_pkgdocdir}
%changelog %changelog
* Mon Dec 21 2015 Oliver Haessler <oliver@redhat.com> - 2.2.0-6
- added new patch for EL7 build
* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-5 * Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-5
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5

Loading…
Cancel
Save