Fix for 64 bit compatibility.

- Fix hardcoding path.
- Use %cmake to set default paths.

diff --git a/packaging/libwifi-direct.spec b/packaging/libwifi-direct.spec
index 08ac4a1..4b57185 100755 (executable)
--- a/packaging/libwifi-direct.spec
+++ b/packaging/libwifi-direct.spec
@@ -1,26 +1,22 @@
 Name:       libwifi-direct
-Summary:    wifi direct library (Shared Library)
+Summary:    Wifi direct library (Shared Library)
 Version:    0.3.4
 Release:    1
-Group:      TO_BE_FILLED
+Group:      Connectivity/Wireless
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(vconf)
-
 BuildRequires:  cmake
 BuildRequires:  gettext-devel
 
-#%define debug_package %{nil}  
-
 %description
 wifi direct library (Shared Library)
 
-
 %package devel 
 Summary:    wifi direct library (Shared Library) (Developement)
-Group:      TO_BE_FILLED 
+Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
@@ -36,22 +32,15 @@ export ARCH=i586
 %endif
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
-#make %{?jobs:-j%jobs}
+%cmake .
 
 %install
-rm -rf %{buildroot}
 %make_install
 %__strip %{buildroot}%{_libdir}/libwifi-direct.so.0.0
 
 mkdir -p %{buildroot}/usr/share/license
 cp %{_builddir}/%{buildsubdir}/LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
 
-%post
-
-%postun
-
-
 %files
 %manifest libwifi-direct.manifest
 %defattr(-,root,root,-)
@@ -65,4 +54,3 @@ cp %{_builddir}/%{buildsubdir}/LICENSE.APLv2 %{buildroot}/usr/share/license/%{na
 %{_libdir}/pkgconfig/wifi-direct.pc
 %{_includedir}/wifi-direct/wifi-direct.h
 %{_includedir}/wifi-direct/wifi-direct-internal.h
-

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 59162d1..99fa43e 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -105,8 +105,8 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 CONFIGURE_FILE(wifi-direct.pc.in wifi-direct.pc @ONLY)
 
 # Install
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT Runtime) 
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT Runtime)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/wifi-direct.h DESTINATION include/wifi-direct)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/wifi-direct-internal.h DESTINATION include/wifi-direct)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/wifi-direct.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/wifi-direct.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 

diff --git a/src/wifi-direct.pc.in b/src/wifi-direct.pc.in
index cc614a4..971fb6a 100755 (executable)
--- a/src/wifi-direct.pc.in
+++ b/src/wifi-direct.pc.in
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=@prefix@
-libdir=@prefix@/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=@prefix@/include
 
 Name: wifi-direct