From ae921637952cee89472cb8abc63e2b36276794cc Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Wed, 29 May 2013 06:50:55 -0400 Subject: [PATCH] Fixed build and remove hardcoding of libdir --- CMakeLists.txt | 2 +- packaging/capi-network-wifi-direct.changes | 3 +++ packaging/capi-network-wifi-direct.spec | 20 ++++++++------------ 3 files changed, 12 insertions(+), 13 deletions(-) create mode 100644 packaging/capi-network-wifi-direct.changes diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e39e81..5f488a7 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ CONFIGURE_FILE( ${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) IF(UNIX) diff --git a/packaging/capi-network-wifi-direct.changes b/packaging/capi-network-wifi-direct.changes new file mode 100644 index 0000000..04b8cc1 --- /dev/null +++ b/packaging/capi-network-wifi-direct.changes @@ -0,0 +1,3 @@ +* Wed May 29 2013 Anas Nashif accepted/tizen/20130520.100855@afb2ebe +- Fixed build and remove hardcoding of libdir + diff --git a/packaging/capi-network-wifi-direct.spec b/packaging/capi-network-wifi-direct.spec index 327d6d6..32b950a 100755 --- a/packaging/capi-network-wifi-direct.spec +++ b/packaging/capi-network-wifi-direct.spec @@ -1,12 +1,10 @@ Name: capi-network-wifi-direct Summary: Network WiFi-Direct library in Tizen CAPI -Version: 0.0.4 +Version: 0.0.4 Release: 3 -Group: TO_BE_FILLED -License: TO_BE_FILLED +Group: API/C API +License: Apache-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(vconf) @@ -14,12 +12,11 @@ BuildRequires: pkgconfig(capi-base-common) BuildRequires: cmake %description - -%define debug_package %{nil} +WiFi-Direct library (Shared Library) %package devel Summary: WiFi-Direct library (Shared Library) (Developement) -Group: TO_BE_FILLED +Group: Development/API Requires: capi-base-common-devel BuildRequires: pkgconfig(wifi-direct) %description devel @@ -29,16 +26,15 @@ WiFi-Direct library (Shared Library) (Developement) %setup -q %build -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +%cmake . make %{?jobs:-j%jobs} %install -rm -rf %{buildroot} %make_install -%post +%post -p /sbin/ldconfig -%postun +%postun -p /sbin/ldconfig %files %manifest capi-network-wifi-direct.manifest -- 2.7.4