X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=moonshot-ui.spec.in;h=e227013612c070679c64b72101ef2a3c7e50768b;hb=f8c3b55edf6f8a54556d36982897a974f723f5ef;hp=7d7365f41af4b570bc89af4be5a76ea5d095cf45;hpb=af8596fae903b4e05e65651368c48639b3761209;p=moonshot-ui.git

diff --git a/moonshot-ui.spec.in b/moonshot-ui.spec.in
index 7d7365f..e227013 100644
--- a/moonshot-ui.spec.in
+++ b/moonshot-ui.spec.in
@@ -1,6 +1,7 @@
 Name:           @PACKAGE@
 Version:        @VERSION@
-Release:        2%{?dist}
+<<<<<<< HEAD
+Release:        1%{?dist}
 Summary:        Moonshot Federated Identity User Interface
 
 Group:          Security Tools
@@ -16,8 +17,9 @@ BuildRequires:  	dbus-devel
 BuildRequires: 		dbus-glib-devel
 BuildRequires: 		desktop-file-utils
 BuildRequires: 		shared-mime-info
+BuildRequires: gnome-keyring-devel
 
-#Requires:       
+Requires:        desktop-file-utils, shared-mime-info, dbus-x11
 
 %description
 
@@ -65,6 +67,7 @@ Requires: moonshot-ui  = %{version}-%{release}
 %{_datadir}/moonshot-ui
 %{_libexecdir}/moonshot-ui/moonshot-dbus-launch
 %{_libdir}/libmoonshot.so.*
+%config(noreplace) %{_sysconfdir}/moonshot/*
 %doc webprovisioning/default-identity.msht
 
 %files devel