From 847d83e6501949c3364db65872da34ce6c663960 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Aug 06 2013 19:31:13 +0000
Subject: For F-20 unversioned docdirs feature we need to build with


  configure --with-readmedir=... to override the internal GQ_HELPDIR.

---

diff --git a/geeqie.spec b/geeqie.spec
index 2f56871..c1a9fab 100644
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -1,10 +1,12 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 %define upstreamversion 1.1
 %global _hardened_build 1
 
 Summary: Image browser and viewer
 Name: geeqie
 Version: 1.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2+
 Group: User Interface/X
 Source: http://downloads.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
@@ -73,21 +75,22 @@ done
 
 
 %build
-%configure --enable-lirc --disable-tiff
+%configure --enable-lirc --disable-tiff \
+    --with-readmedir=%{_pkgdocdir}
 make %{?_smp_mflags}
 
 
 %install
-mkdir -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{upstreamversion}/html
+mkdir -p ${RPM_BUILD_ROOT}%{_pkgdocdir}/html
 make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p" install
 
 # guard against missing HTML tree
-[ ! -f ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}-%{upstreamversion}/html/index.html ] && exit -1
+[ ! -f ${RPM_BUILD_ROOT}%{_pkgdocdir}/html/index.html ] && exit -1
 
 # We want these _docdir files in GQ_HELPDIR.
 install -p -m 0644 AUTHORS COPYING NEWS README* TODO \
-    ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}-%{upstreamversion}
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}-%{upstreamversion}/ChangeLog
+    ${RPM_BUILD_ROOT}%{_pkgdocdir}
+rm -f ${RPM_BUILD_ROOT}%{_pkgdocdir}/ChangeLog
 
 desktop-file-install \
     --delete-original \
@@ -110,7 +113,7 @@ update-desktop-database &> /dev/null || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/%{name}*
+%doc %{_pkgdocdir}/
 %{_bindir}/%{name}*
 %{_prefix}/lib/%{name}/
 %{_mandir}/man1/%{name}.1*
@@ -120,6 +123,10 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Tue Aug  6 2013 Michael Schwendt <mschwendt@fedoraproject.org> - 1.1-13
+- For F-20 unversioned docdirs feature we need to build with
+  configure --with-readmedir=... to override the internal GQ_HELPDIR.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild