[libgphoto2/f20] Fixed documentation issue due to unversioned doc dirs (bug #1001263).

Tim Waugh twaugh at fedoraproject.org
Wed Aug 28 14:08:54 UTC 2013


commit 5b54c9d63b873350c87e23a3b99a45b25aad4e0a
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Aug 28 14:44:36 2013 +0100

    Fixed documentation issue due to unversioned doc dirs (bug #1001263).
    
    Resolves: rhbz#1001263

 libgphoto2.spec |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/libgphoto2.spec b/libgphoto2.spec
index 988eb7d..8bf22b4 100644
--- a/libgphoto2.spec
+++ b/libgphoto2.spec
@@ -2,7 +2,7 @@
 
 Name:           libgphoto2
 Version:        2.5.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Library for accessing digital cameras
 Group:          Development/Libraries
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
@@ -111,6 +111,10 @@ rm -rf %{buildroot}%{_libdir}/*.la
 %find_lang %{name}_port-10
 cat libgphoto2*.lang >> %{name}.lang
 
+# https://fedoraproject.org/wiki/Packaging_tricks#With_.25doc
+mkdir __doc
+mv %{buildroot}%{_defaultdocdir}/%{name}/* __doc
+rm -rf %{buildroot}%{_defaultdocdir}/%{name}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -129,7 +133,7 @@ cat libgphoto2*.lang >> %{name}.lang
 %{udevdir}/check-ptp-camera
 
 %files devel
-%doc %{_docdir}/%{name}
+%doc __doc/*
 %{_datadir}/libgphoto2
 %{_bindir}/gphoto2-config*
 %{_bindir}/gphoto2-port-config
@@ -139,6 +143,9 @@ cat libgphoto2*.lang >> %{name}.lang
 %{_mandir}/man3/*
 
 %changelog
+* Wed Aug 28 2013 Tim Waugh <twaugh at redhat.com> - 2.5.2-5
+- Fixed documentation issue due to unversioned doc dirs (bug #1001263).
+
 * Fri Aug 16 2013 Tim Waugh <twaugh at redhat.com> - 2.5.2-4
 - Build against libusbx instead of libusb (bug #997880).
 


More information about the scm-commits mailing list