Tidy up EL compat (and sync epel and Fedora)

fish.spec

@@ -1,6 +1,6 @@
 Name:                   fish
 Version:                2.2.0
-Release:                7%{?dist}
+Release:                8%{?dist}
 Summary:                A friendly interactive shell
 
 Group:                  System Environment/Shells
@@ -37,6 +37,10 @@ smart and user-friendly. fish supports powerful features like syntax
 highlighting, autosuggestions, and tab completions that just work, with
 nothing to learn or configure.
 
+# EPEL compatibility
+%if 0%{?rhel}
+%global _pkgdocdir %{_docdir}/%{name}
+%endif
 
 %prep
 %setup -q
@@ -50,11 +54,7 @@ rm create_wajig_completions.py
 
 
 %build
-%if 0%{?rhel}
-%configure --docdir=%{_docdir}/%{name}
-%else
 %configure --docdir=%{_pkgdocdir}
-%endif
 make %{?_smp_mflags} all fish_tests
 
 
@@ -71,13 +71,8 @@ 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
 
@@ -110,14 +105,12 @@ fi
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/fish
 %{_datadir}/fish/
-
-%if 0%{?rhel}
-%{_docdir}/%{name}
-%else
 %{_pkgdocdir}
-%endif
 
 %changelog
+* Mon Jan 04 2016 Andy Lutomirski <luto@mit.edu> - 2.2.0-8
+- Tidy up EL compat
+
 * Sat Jan 02 2016 Oliver Haessler <oliver@redhat.com> - 2.2.0-7
 - included patch directly into the spec file
 - added new patch for using python3.4 on EPEL 7