Merge branch 'f20'

Conflicts:
	libgphoto2.spec

libgphoto2.spec

@@ -2,7 +2,7 @@
 
 Name:           libgphoto2
 Version:        2.5.3
-Release:        6%{?dist}
+Release:        7%{?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
@@ -131,10 +131,10 @@ rm -rf %{buildroot}%{_defaultdocdir}/%{name}
 %{_libdir}/*.so.*
 %{_udevrulesdir}/40-libgphoto2.rules
 %{udevdir}/check-ptp-camera
+%{_datadir}/libgphoto2
 
 %files devel
 %doc __doc/*
-%{_datadir}/libgphoto2
 %{_bindir}/gphoto2-config*
 %{_bindir}/gphoto2-port-config
 %{_includedir}/gphoto2
@@ -143,6 +143,9 @@ rm -rf %{buildroot}%{_defaultdocdir}/%{name}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Apr 11 2014 Tim Waugh <twaugh@redhat.com> - 2.5.3-7
+- Moved runtime-required files to main package (bug #1086411).
+
 * Wed Feb 12 2014 Jon Disnard <jdisnard@gmail.com> - 2.5.3-6
 - Bump to latest upstream version.