Merge branch 'master' of http://www.project-moonshot.org/git/moonshot-ui

diff --git a/Makefile.am b/Makefile.am
index 4ceff9c..0798d86 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -171,6 +171,7 @@ endif
 endif
 
 EXTRA_DIST = webprovisioning/moonshot.xml $(dbusservice_in_files) \
+       moonshot-dbus-launch \
        moonshot-ui.spec
 
 noinst_PROGRAMS = \

diff --git a/moonshot-ui.spec.in b/moonshot-ui.spec.in
index 349e6a8..d4f859f 100644 (file)
--- a/moonshot-ui.spec.in
+++ b/moonshot-ui.spec.in
@@ -46,6 +46,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %package devel
 Summary: Moonshot UI Development
+Requires: moonshot-ui  = %{version}-%{release}
 
 %description devel
 
@@ -61,12 +62,13 @@ Summary: Moonshot UI Development
 %{_datadir}/applications/*
 %{_datadir}/dbus-1/*
 %{_datadir}/mime/packages/*
+%{_libexecdir}/moonshot-ui/moonshot-dbus-launch
 %{_libdir}/libmoonshot.so.*
 
 %files devel
 %{_includedir}/*.h
 %{_libdir}/libmoonshot.a
-%{_libdir}/libmoonshot.so*
+%{_libdir}/libmoonshot.so
 %exclude %{_libdir}/*.la