[webkitgtk] Fix for unversioned doc dirs
Kevin Fenzi
kevin at fedoraproject.org
Sat Jul 27 22:37:50 UTC 2013
commit 1ebe8fa79eb00cc08fe03dd1644ed08310b57d27
Author: Kevin Fenzi <kevin at scrye.com>
Date: Sat Jul 27 16:37:29 2013 -0600
Fix for unversioned doc dirs
webkitgtk.spec | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/webkitgtk.spec b/webkitgtk.spec
index d0b3f6e..f4121e0 100644
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@@ -1,13 +1,16 @@
+# In f20+ use unversioned docdirs, otherwise the old versioned one
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
## NOTE: Lots of files in various subdirectories have the same name (such as
## "LICENSE") so this short macro allows us to distinguish them by using their
## directory names (from the source tree) as prefixes for the files.
%define add_to_doc_files() \
- mkdir -p %{buildroot}%{_docdir}/%{name}-%{version} ||: ; \
- cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g')
+ mkdir -p %{buildroot}%{_pkgdocdir} ||: ; \
+ cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g')
Name: webkitgtk
Version: 2.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GTK+ Web content engine library
Group: Development/Libraries
@@ -178,7 +181,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%files -f WebKitGTK-2.0.lang
-%doc %{_docdir}/%{name}-%{version}/
+%doc %{_pkgdocdir}
%{_libdir}/libwebkitgtk-1.0.so.*
%{_libdir}/libjavascriptcoregtk-1.0.so.*
%{_libdir}/girepository-1.0/WebKit-1.0.typelib
@@ -203,6 +206,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%changelog
+* Sat Jul 27 2013 Kevin Fenzi <kevin at scrye.com> 2.0.4-2
+- Fix for unversioned doc dirs
+
* Mon Jul 22 2013 Tomas Popela <tpopela at redhat.com> - 2.0.4-1
- Update to 2.0.4
More information about the scm-commits
mailing list