fix smack lib dependency

 - clean spec file
 - remove deprecated code

Change-Id: I2acbbb8fbc7602d2a6858a8adb14507fa546111e
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd55024..0199c7d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,10 +2,6 @@
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(ail C)
-OPTION(SMACK "Enable smack support" ON)
-IF(SMACK)
-    ADD_DEFINITIONS("-DWRT_SMACK_ENABLED")  # enable smack
-ENDIF(SMACK)
 SET(LIBNAME "lib${PROJECT_NAME}")
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(BINDIR "${PREFIX}/bin")
@@ -33,12 +29,12 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
 INCLUDE(FindPkgConfig)
 
-pkg_check_modules(LDPC REQUIRED libtzplatform-config libsmack)
+pkg_check_modules(LDPC REQUIRED libtzplatform-config)
 FOREACH(flag ${LDPC_LIBRARIES})
        SET(PC_LIB "${PC_LIB} -l${flag}")
 ENDFOREACH(flag)
 
-pkg_check_modules(LPKGS REQUIRED glib-2.0 sqlite3 dlog db-util xdgmime vconf libtzplatform-config)
+pkg_check_modules(LPKGS REQUIRED glib-2.0 sqlite3 dlog db-util xdgmime vconf libtzplatform-config libsmack)
 STRING(REPLACE ";" " " EXTRA_CFLAGS "${LPKGS_CFLAGS}")
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden")
 

diff --git a/packaging/ail.spec b/packaging/ail.spec
index 177a9d8..2a5ce8a 100755 (executable)
--- a/packaging/ail.spec
+++ b/packaging/ail.spec
@@ -16,7 +16,6 @@ BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(xdgmime)
 BuildRequires:  pkgconfig(libtzplatform-config)
 Provides:       libail = %{version}-%{release}
-Requires:              libcap-tools
 
 %description
 Application Information Library package
@@ -25,7 +24,7 @@ Application Information Library package
 Summary:        Application Information Library Development files
 Requires:       libail = %{version}-%{release}
 Requires:       pkgconfig(libtzplatform-config)
-Requires:              pkgconfig(libsmack)
+Requires:       pkgconfig(libsmack)
 
 %description devel
 Application Information Library Development files package
@@ -35,7 +34,7 @@ Application Information Library Development files package
 cp %{SOURCE1001} .
 
 %build
-CFLAGS+=" -fpic"
+CFLAGS="$CFLAGS -fpic"
 
 %if 0%{?tizen_build_binary_release_type_eng}
 export CFLAGS="$CFLAGS -DTIZEN_ENGINEER_MODE"
@@ -44,8 +43,7 @@ export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE"
 %endif
 
 %cmake .  -DTZ_SYS_RW_DESKTOP_APP=%TZ_SYS_RW_DESKTOP_APP \
-          -DBUILD_PKGTYPE=rpm \
-                 -DSMACK=Off
+          -DBUILD_PKGTYPE=rpm
 
 %__make %{?_smp_mflags}
 
@@ -57,8 +55,8 @@ ldconfig
 # Create tizenglobalapp user needed for global installation
 useradd -d %TZ_SYS_RW_APP -m %TZ_SYS_GLOBALAPP_USER -r -c "system user for common applications" -g root
 
-#mkdir -p %TZ_SYS_RW_APP/.config/xwalk-service/applications
-#cd %TZ_SYS_RW_APP/
+#mkdir -p %%TZ_SYS_RW_APP/.config/xwalk-service/applications
+#cd %%TZ_SYS_RW_APP/
 #ln -s .config/xwalk-service/applications/
 
 vconftool set -t string db/ail/ail_info "0" -f -s system::vconf_inhouse