- Adapt makefile for lib64
- Cleanup up spec file a little bit
- Make deprecated glib calls depend on version being used
Change-Id: Ic31fefe778900f14d2974bfb94655fc473488111
-INSTALL(TARGETS ${fw_name} DESTINATION lib)
+INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
INSTALL(
DIRECTORY ${INC_DIR}/ DESTINATION include/network
FILES_MATCHING
INSTALL(
DIRECTORY ${INC_DIR}/ DESTINATION include/network
FILES_MATCHING
${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc
@ONLY
)
${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc
@ONLY
)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
prefix=@PREFIX@
exec_prefix=/usr
prefix=@PREFIX@
exec_prefix=/usr
+libdir=@LIB_INSTALL_DIR@
includedir=/usr/include/network
Name: @PC_NAME@
includedir=/usr/include/network
Name: @PC_NAME@
Summary: Network Serial Framework
Version: 0.0.7
Release: 0
Summary: Network Serial Framework
Version: 0.0.7
Release: 0
License: Apache License, Version 2.0
Source0: %{name}-%{version}.tar.gz
License: Apache License, Version 2.0
Source0: %{name}-%{version}.tar.gz
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(dlog)
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(dlog)
%package devel
Summary: Network Serial Framework (DEV)
%package devel
Summary: Network Serial Framework (DEV)
Requires: %{name} = %{version}-%{release}
%description devel
Requires: %{name} = %{version}-%{release}
%description devel
%build
MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
%build
MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
make %{?jobs:-j%jobs}
%install
make %{?jobs:-j%jobs}
%install
pHandle = (serial_s *)g_try_malloc0(sizeof(serial_s));
if (pHandle == NULL)
return SERIAL_ERROR_OUT_OF_MEMORY;
pHandle = (serial_s *)g_try_malloc0(sizeof(serial_s));
if (pHandle == NULL)
return SERIAL_ERROR_OUT_OF_MEMORY;
+#if !GLIB_CHECK_VERSION (2, 35, 3)
+ g_type_init ();
+#endif
pHandle->client_bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
if (error) {
pHandle->client_bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
if (error) {