From bb45ec91fbdb23156916854a5fd8e881dca75d28 Mon Sep 17 00:00:00 2001
From: Oliver Haessler <oliver@redhat.com>
Date: Jan 02 2016 13:10:07 +0000
Subject: included patch directly into the spec file


---

diff --git a/0001-Do-not-use-pkgdocdir-it-is-not-defined.patch b/0001-Do-not-use-pkgdocdir-it-is-not-defined.patch
deleted file mode 100644
index de893a9..0000000
--- a/0001-Do-not-use-pkgdocdir-it-is-not-defined.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 55bbbd95b508114998241a777a22de1dc6e8c05e Mon Sep 17 00:00:00 2001
-From: Oliver Haessler <oliver@redhat.com>
-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 04cc727..e1f8922 100644
--- a/fish.spec
+++ b/fish.spec
@@ -13,7 +13,6 @@ 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
@@ -36,9 +35,6 @@ nothing to learn or configure.
 %patch0 -p1
 %patch1 -p2
 %patch2 -p2
-%if 0%{?rhel}
-%patch3 -p2
-%endif
 
 # This is unused.  If we fiddle with Python versions, its presence will
 # be confusing.
@@ -46,7 +42,11 @@ rm create_wajig_completions.py
 
 
 %build
+%if 0%{?rhel}
+%configure --docdir=%{_docdir}/%{name}
+%else
 %configure --docdir=%{_pkgdocdir}
+%endif
 make %{?_smp_mflags} all fish_tests
 
 
@@ -63,9 +63,13 @@ gzip %{buildroot}%{_datadir}/fish/man/man1/*.1
 rm %{buildroot}/usr/share/pkgconfig/fish.pc
 
 # Install docs from tarball root
+%if 0%{?rhel}
+cp README.md %{buildroot}%{_docdir}/%{name}
+cp CONTRIBUTING.md %{buildroot}%{_docdir}/%{name}
+%else
 cp README.md %{buildroot}%{_pkgdocdir}
 cp CONTRIBUTING.md %{buildroot}%{_pkgdocdir}
-
+%endif
 
 %check
 
@@ -98,10 +102,17 @@ fi
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/fish
 %{_datadir}/fish/
-%{_pkgdocdir}
 
+%if 0%{?rhel}
+%{_docdir}/%{name}
+%else
+%{_pkgdocdir}
+%endif
 
 %changelog
+* Sat Jan 02 2016 Oliver Haessler <oliver@redhat.com> - 2.2.0-7
+- included patch directly into the spec file
+
 * Mon Dec 21 2015 Oliver Haessler <oliver@redhat.com> - 2.2.0-6
 - added new patch for EL7 build