From 72582aaa47c8361ef6d9fb420e4a1d0da864f837 Mon Sep 17 00:00:00 2001 From: Oliver Haessler Date: Jan 02 2016 12:56:41 +0000 Subject: added new patch for EL7 build --- diff --git a/0001-Do-not-use-pkgdocdir-it-is-not-defined.patch b/0001-Do-not-use-pkgdocdir-it-is-not-defined.patch new file mode 100644 index 0000000..de893a9 --- /dev/null +++ b/0001-Do-not-use-pkgdocdir-it-is-not-defined.patch @@ -0,0 +1,41 @@ +From 55bbbd95b508114998241a777a22de1dc6e8c05e Mon Sep 17 00:00:00 2001 +From: Oliver Haessler +Date: Mon, 21 Dec 2015 11:17:32 +0100 +Subject: [PATCH 1/1] Do-not-use-pkgdocdir-it-is-not-defined + +diff --git a/fish.spec b/fish.spec +index ec7902a..4cdf45e 100644 +--- a/fish.spec ++++ b/fish.spec +@@ -38,7 +38,7 @@ rm create_wajig_completions.py + + + %build +-%configure --docdir=%{_pkgdocdir} ++%configure --docdir=%{_docdir}/%{name} + make %{?_smp_mflags} all fish_tests + + +@@ -55,8 +55,8 @@ gzip %{buildroot}%{_datadir}/fish/man/man1/*.1 + rm %{buildroot}/usr/share/pkgconfig/fish.pc + + # Install docs from tarball root +-cp README.md %{buildroot}%{_pkgdocdir} +-cp CONTRIBUTING.md %{buildroot}%{_pkgdocdir} ++cp README.md %{buildroot}%{_docdir}/%{name} ++cp CONTRIBUTING.md %{buildroot}%{_docdir}/%{name} + + + %check +@@ -90,7 +90,7 @@ fi + %{_bindir}/* + %config(noreplace) %{_sysconfdir}/fish + %{_datadir}/fish/ +-%{_pkgdocdir} ++%{_docdir}/%{name} + + + %changelog +-- +1.8.3.1 + diff --git a/fish.spec b/fish.spec index 0471904..04cc727 100644 --- a/fish.spec +++ b/fish.spec @@ -13,6 +13,7 @@ Patch0: fish-use-usrbinpython3.patch # Pull request #2393, hopefully fixing #2392 / rhbz #1263052 Patch1: pr-2393-1.patch Patch2: pr-2393-2.patch +Patch3: 0001-Do-not-use-pkgdocdir-it-is-not-defined.patch %if 0%{?rhel} BuildRequires: python34-devel