g_type_init() is deprecated for glib >= 2.35.0. Use general setting of cmake.

Change-Id: I24eeee258bd159cb912528b79ba14134a52a867e

diff --git a/packaging/telephony-daemon.spec b/packaging/telephony-daemon.spec
index e5a1cea..3e74e01 100644 (file)
--- a/packaging/telephony-daemon.spec
+++ b/packaging/telephony-daemon.spec
@@ -19,23 +19,23 @@ Description: Telephony daemon
 %setup -q
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DVERSION=%{version}
+%cmake . -DVERSION=%{version}
 make %{?jobs:-j%jobs}
 
 %install
 %make_install
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-install -m 0644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/telephony.service
-ln -s ../telephony.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/telephony.service
+mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants
+install -m 0644 %{SOURCE1} %{buildroot}%{_prefix}/lib/systemd/system/telephony.service
+ln -s ../telephony.service %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants/telephony.service
 mkdir -p %{buildroot}/usr/share/license
 
 %files
 %manifest telephony-daemon.manifest
 %defattr(-,root,root,-)
 %{_bindir}/telephony-daemon
-%{_initrddir}/telephony-daemon
+%{_sysconfdir}/rc.d/init.d/telephony-daemon
 %{_sysconfdir}/rc.d/rc3.d/S30telephony-daemon
 %{_sysconfdir}/rc.d/rc5.d/S30telephony-daemon
-%{_libdir}/systemd/system/telephony.service
-%{_libdir}/systemd/system/multi-user.target.wants/telephony.service
+%{_prefix}/lib/systemd/system/telephony.service
+%{_prefix}/lib/systemd/system/multi-user.target.wants/telephony.service
 /usr/share/license/telephony-daemon

diff --git a/src/main.c b/src/main.c
index bb905f9..91b1d7b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -250,7 +250,9 @@ int main(int argc, char *argv[])
 
        info("plugin_path: [%s]", plugin_path);
 
+#if !GLIB_CHECK_VERSION(2,35,0)
        g_type_init();
+#endif
 #if !GLIB_CHECK_VERSION (2, 31, 0)
        g_thread_init(NULL);
 #endif