[midori] Fix for unversioned doc dirs

Kevin Fenzi kevin at fedoraproject.org
Sat Jul 27 16:29:30 UTC 2013


commit 78080a6ec28ff524b8fa3a08f6563695ba10a804
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Sat Jul 27 10:29:21 2013 -0600

    Fix for unversioned doc dirs

 midori.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/midori.spec b/midori.spec
index 912219d..2418f51 100644
--- a/midori.spec
+++ b/midori.spec
@@ -1,6 +1,8 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		midori
 Version:	0.5.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
 Group:		Applications/Internet
@@ -72,7 +74,7 @@ developing extensions for %{name}.
 export CFLAGS="%{optflags}"
 ## Currently does not build against Fedora waf
 ./waf	--prefix=%{_usr}			\
-	--docdir=%{_docdir}/%{name}-%{version}	\
+	--docdir=%{_pkgdocdir}                  \
 	--libdir=%{_libdir}			\
 	--enable-apidocs			\
         --disable-zeitgeist                     \
@@ -118,7 +120,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc %{_docdir}/%{name}-%{version}/
+%doc %{_pkgdocdir}
 %{_bindir}/midori
 %if 0%{?fedora} < 19
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -142,6 +144,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Jul 27 2013 Kevin Fenzi <kevin at scrye.com> 0.5.4-2
+- Fix for unversioned doc dirs
+
 * Mon Jul 15 2013 Kevin Fenzi <kevin at scrye.com> 0.5.4-1
 - Update to 0.5.4
 


More information about the scm-commits mailing list