From 405a21be528af97928374a77cc286618be60c630 Mon Sep 17 00:00:00 2001 From: hj kim Date: Mon, 22 Jun 2020 17:59:42 +0900 Subject: [PATCH] Remove unnecessary libsmack dependency Change-Id: Ia3f7473f924af39e2f97af545fc468c161d8ba59 --- Makefile.am | 4 ---- configure.ac | 5 ----- lib/media-util-db.c | 1 - packaging/media-server.spec | 3 +-- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index 27f1382..c9f3b8a 100755 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,6 @@ COMMON_CFLAGS = -I${srcdir}/lib/include \ $(LIBSYSTEMDLOGIN_CFLAGS) \ $(SECURITY_CFLAGS) \ $(SYSTEM_INFO_CFLAGS) \ - $(SMACK_CFLAGS) \ $(USB_DEVICE_CFLAGS) \ $(PHONESTATUS_CFLAGS) \ $(SYSTEM_DEVICE_CFLAGS) \ @@ -43,7 +42,6 @@ COMMON_LDADD = libmedia-utils.la \ $(SECURITY_LIBS) \ $(SYSTEM_INFO_LIBS) \ $(SYSTEM_DEVICE_LIBS) \ - $(SMACK_LIBS) \ $(USB_DEVICE_LIBS) \ -ldl @@ -74,7 +72,6 @@ libmedia_utils_la_CFLAGS = -I${srcdir}/lib/include \ $(ICUI18N_CFLAGS) \ $(PHONESTATUS_CFLAGS) \ $(TZ_PLATFORM_CONFIG_CFLAGS) \ - $(LIBSMACK_CFLAGS) \ $(CYNARA_CLIENT_CFLAGS) \ $(CYNARA_SESSION_CFLAGS) \ $(CYNARA_CREDS_SOCKET_CFLAGS) \ @@ -88,7 +85,6 @@ libmedia_utils_la_LIBADD = $(GLIB_LIBS) \ $(ICUI18N_LIBS) \ $(PHONESTATUS_LIBS) \ $(TZ_PLATFORM_CONFIG_LIBS) \ - $(LIBSMACK_LIBS) \ $(CYNARA_CLIENT_LIBS) \ $(CYNARA_SESSION_LIBS) \ $(CYNARA_CREDS_SOCKET_LIBS) \ diff --git a/configure.ac b/configure.ac index 31107fe..cb95dff 100755 --- a/configure.ac +++ b/configure.ac @@ -97,11 +97,6 @@ PKG_CHECK_MODULES(TZ_PLATFORM_CONFIG, libtzplatform-config) AC_SUBST(TZ_PLATFORM_CONFIG_CFLAGS) AC_SUBST(TZ_PLATFORM_CONFIG_LIBS) -#smack lib -PKG_CHECK_MODULES(LIBSMACK, libsmack) -AC_SUBST(LIBSMACK_CFLAGS) -AC_SUBST(LIBSMACK_LIBS) - #cynara PKG_CHECK_MODULES(CYNARA_CLIENT, cynara-client) AC_SUBST(CYNARA_CLIENT_CFLAGS) diff --git a/lib/media-util-db.c b/lib/media-util-db.c index 94bd756..88c271b 100755 --- a/lib/media-util-db.c +++ b/lib/media-util-db.c @@ -22,7 +22,6 @@ #include #include #include -#include #include diff --git a/packaging/media-server.spec b/packaging/media-server.spec index c8b8371..a003da4 100755 --- a/packaging/media-server.spec +++ b/packaging/media-server.spec @@ -1,6 +1,6 @@ Name: media-server Summary: A server for media content management -Version: 0.4.6 +Version: 0.4.7 Release: 0 Group: Multimedia/Service License: Apache-2.0 @@ -18,7 +18,6 @@ BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(iniparser) -BuildRequires: pkgconfig(libsmack) BuildRequires: pkgconfig(libsystemd-login) BuildRequires: pkgconfig(libtzplatform-config) BuildRequires: pkgconfig(cynara-client) -- 2.7.4