Make it build on 64bit and general cleanup for 3.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6aca9501e53c1246797624eddd1b575d72c5c741..70705b46b6b56e964e047b2ce5348c1301465f15 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT(device-node C)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "${PREFIX}/bin")
-SET(LIBDIR "${PREFIX}/lib")
+SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "${PREFIX}/include/${PROJECT_NAME}")
 SET(VERSION 0.1)
 
@@ -34,20 +34,17 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS} ${TARGET_SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${rpkgs_LDFLAGS} "-ldl")
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION})
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 # will be deprecated
 CONFIGURE_FILE(devman_plugin.pc.in devman_plugin.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/devman_plugin.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/devman_plugin.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 FOREACH(hfile ${HEADERS})
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${hfile} DESTINATION include/${PROJECT_NAME})
 ENDFOREACH(hfile)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION share/license RENAME ${PROJECT_NAME})
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/smack_device_labeling DESTINATION /etc/rc.d/init.d)
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/udev/ DESTINATION lib/udev)
-INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/device-node.sh DESTINATION /etc/rc.d/init.d)

diff --git a/packaging/libdevice-node.changes b/packaging/libdevice-node.changes
new file mode 100644 (file)
index 0000000..55b6346
--- /dev/null
+++ b/packaging/libdevice-node.changes
@@ -0,0 +1,3 @@
+* Sat May 18 2013 Anas Nashif <anas.nashif@intel.com> submit/tizen/20130517.045152@03de040
+- Make it build on 64bit and general cleanup for 3.0
+

diff --git a/packaging/libdevice-node.spec b/packaging/libdevice-node.spec
index 19a6e8846fcb7845155f8b706a8c8582175d66b5..cded3e4ffa589e6816efbc2d63af78918197c292 100644 (file)
--- a/packaging/libdevice-node.spec
+++ b/packaging/libdevice-node.spec
@@ -3,7 +3,7 @@ Summary:    Library to control OAL APIs
 Version:    0.1.0
 Release:    1
 Group:      System/Libraries
-License:    Apache License, Version 2.0
+License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1:    %{name}.manifest
 Source2:    smack-device-labeling.service
@@ -25,42 +25,30 @@ Library to control OAL APIs (devel)
 
 %prep
 %setup -q
-
+cp %{SOURCE1} .
 %build
-CFLAGS="$CFLAGS" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+%cmake . 
 make %{?jobs:-j%jobs}
 
 %install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/share/license
-cp LICENSE %{buildroot}/usr/share/license/device-node
 %make_install
-cp -a %{SOURCE1} %{buildroot}%{_datadir}/
-install -D -d %{buildroot}/etc/rc.d/rc3.d/
-install -D -d %{buildroot}/etc/rc.d/rc4.d/
-ln -sf ../init.d/smack_device_labeling %{buildroot}/etc/rc.d/rc3.d/S44smack_device_labeling
-ln -sf ../init.d/smack_device_labeling %{buildroot}/etc/rc.d/rc4.d/S44smack_device_labeling
 
 mkdir -p %{buildroot}%{_libdir}/systemd/system/basic.target.wants
 install -m 644 %{SOURCE2} %{buildroot}%{_libdir}/systemd/system/
 ln -s ../smack-device-labeling.service %{buildroot}%{_libdir}/systemd/system/basic.target.wants/
+mkdir -p %{buildroot}/lib/firmware/mdnie
 
-%post
-if [ ! -e "/lib/firmware/mdnie" ]
-then
-       mkdir -p /lib/firmware/mdnie
-fi
 
-%postun
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %{_libdir}/*.so.*
-%{_libdir}/udev/rules.d/*
-%{_datadir}/license/device-node
-%attr(755,root,root) %{_sysconfdir}/rc.d/*
+%{_prefix}/lib/udev/rules.d/*
 %{_libdir}/systemd/system/smack-device-labeling.service
 %{_libdir}/systemd/system/basic.target.wants/smack-device-labeling.service
-%manifest %{_datadir}/%{name}.manifest
+/lib/firmware/mdnie
+%manifest %{name}.manifest
 
 %files devel
 %{_includedir}/device-node/*.h