Merge branch 'next' of github.com:nemomobile/dsme into next

sailfishos · Feb 20, 2014 · 436ac5f · 436ac5f
2 parents 9106863 + d1e6f73
commit 436ac5f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/dsme/dsme-server.c b/dsme/dsme-server.c
@@ -261,8 +261,6 @@ int main(int argc, char *argv[])
       fprintf(stderr, ME "Couldn't set dynamic priority: %s\n", strerror(errno));
   }
 
-  g_thread_init(0); /* notice that this spawns a thread */
-
   parse_options(argc, argv, &module_names);
 
   if (!module_names) {

diff --git a/rpm/dsme.service b/rpm/dsme.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=DSME
 DefaultDependencies=no
-After=local-fs.target syslog.target usb-moded.service
+After=local-fs.target usb-moded.service
 Conflicts=shutdown.target
 
 [Service]

diff --git a/rpm/dsme.spec b/rpm/dsme.spec
@@ -13,7 +13,7 @@ Requires:   statefs
 Requires(preun): systemd
 Requires(post): systemd
 Requires(postun): systemd
-BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(glib-2.0) >= 2.32.0
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(libiphb)