fix up packaging from messed up review 32e88112

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfdf1cd..8182661 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ INSTALL(FILES include/tizen.h DESTINATION include)
 INSTALL(FILES include/tizen_error.h DESTINATION include)
 INSTALL(FILES include/tizen_type.h DESTINATION include)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/capi-base-common.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/capi-base-common.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 SET(INC_DIR include)
 INCLUDE_DIRECTORIES(${INC_DIR})
 

diff --git a/capi-base-common.pc.in b/capi-base-common.pc.in
index 134c791..808bb9c 100755 (executable)
--- a/capi-base-common.pc.in
+++ b/capi-base-common.pc.in
@@ -3,7 +3,7 @@
 
 prefix=/usr
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: capi-base-common

diff --git a/packaging/capi-base-common.manifest b/packaging/capi-base-common.manifest
new file mode 100644 (file)
index 0000000..017d22d
--- /dev/null
+++ b/packaging/capi-base-common.manifest
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+    <domain name="_"/>
+ </request>
+</manifest>

diff --git a/packaging/capi-base-common.spec b/packaging/capi-base-common.spec
index 1f0a53a..bd2b9f3 100644 (file)
--- a/packaging/capi-base-common.spec
+++ b/packaging/capi-base-common.spec
@@ -1,12 +1,14 @@
 Name:       capi-base-common
 Summary:    Common header files of Tizen Native API
 Version:    0.1.6
-Release:    1
+Release:    0
 Group:      System/API
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-BuildRequires:  cmake
-Requires(post): /sbin/ldconfig  
+Source1001: capi-base-common.manifest
+
+BuildRequires:    cmake
+Requires(post):   /sbin/ldconfig  
 Requires(postun): /sbin/ldconfig
 
 %description
@@ -22,30 +24,31 @@ This is Common header files of Tizen Native API
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-cmake . -DCMAKE_INSTALL_PREFIX=/usr -DLIB_INSTALL_DIR:PATH=%{_libdir} -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 
-make %{?jobs:-j%jobs}
+%__make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-
 %make_install
-mkdir -p %{buildroot}/usr/share/license
-cp LICENSE %{buildroot}/usr/share/license/%{name}
+mkdir -p %{buildroot}%{_datadir}/license
+cp LICENSE %{buildroot}%{_datadir}/license/%{name}
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-/usr/share/license/%{name}
+%manifest %{name}.manifest
 %{_libdir}/libcapi-base-common.so*
+%{_datadir}/license/%{name}
 
 %files devel
-/usr/include/*.h
-/usr/lib/pkgconfig/capi-base-common.pc
-/usr/share/license/%{name}
+%manifest %{name}.manifest
+%{_includedir}/*.h
+%{_libdir}/pkgconfig/capi-base-common.pc
+%{_datadir}/license/%{name}