Sync with tizen_2.2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c2ad84..af4f8f7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT(dukgenerator C)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
+SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "\${prefix}/include")
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/inc)
@@ -57,8 +57,9 @@ SET(PC_LDFLAGS -l${PROJECT_NAME})
 SET(PC_REQUIRED ${pc_requires})
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
 
-INSTALL(FILES ${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib)
+INSTALL(FILES ${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION /usr/include)
 
 ADD_DEFINITIONS(-D_bool_cryptsvc)
+ADD_DEFINITIONS("-fPIC")

diff --git a/dukgenerator.pc.in b/dukgenerator.pc.in
index 2cd5754..81356ed 100755 (executable)
--- a/dukgenerator.pc.in
+++ b/dukgenerator.pc.in
@@ -1,7 +1,7 @@
 # Package Information for pkg-config
 
 prefix=@PREFIX@
-libdir=@PREFIX@/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=@PREFIX@/include
 
 Name: @PC_NAME@

diff --git a/packaging/dukgenerator.changes b/packaging/dukgenerator.changes
new file mode 100644 (file)
index 0000000..721bfa0
--- /dev/null
+++ b/packaging/dukgenerator.changes
@@ -0,0 +1,6 @@
+* Wed Jun 05 2013 Xavier Roche <xavrock.os@gmail.com> accepted/tizen/20130529.191247@7ba04ad
+- Fix hardcoded library path for x64 build
+
+* Wed May 29 2013 Anas Nashif <anas.nashif@intel.com> accepted/tizen/20130520.101220@3f50ab9
+- Fixed package metadata and description
+

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

diff --git a/packaging/dukgenerator.spec b/packaging/dukgenerator.spec
index b5cab3d..bb9c4b8 100644 (file)
--- a/packaging/dukgenerator.spec
+++ b/packaging/dukgenerator.spec
@@ -1,49 +1,49 @@
-Name:      dukgenerator
-Summary:   nothing
-Version:    1.0.0
-Release:    7
-Group:      security
-License:    Apache License, Version 2.0
-Source0:    %{name}-%{version}.tar.gz
-BuildRequires: cmake
-
-BuildRequires: pkgconfig(openssl)
-BuildRequires: pkgconfig(cryptsvc)
+Name:           dukgenerator
+Version:        1.0.0
+Release:        7
+License:        Apache-2.0
+Summary:        Device Unique Key Library
+Group:          Security/Libraries
+Source0:        %{name}-%{version}.tar.gz
+Source1001:    dukgenerator.manifest
+BuildRequires:  cmake
+
+BuildRequires:  pkgconfig(cryptsvc)
+BuildRequires:  pkgconfig(openssl)
 
 %description
+Device Unique Key Library.
 
 %package devel
-Summary: nothing
-Group: security
-Requires: %{name} = %{version}-%{release}
+Summary:        Device Unique Key Library
+Group:          Development/Libraries
+Requires:       %{name} = %{version}
 
 %description devel
+Device Unique Key Library (Development Files).
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DDESCRIPTION=%{summary}
-make %{?jobs:-j%jobs}
+%cmake . -DLIB_INSTALL_DIR:PATH=%{_libdir} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DDESCRIPTION="%{summary}" -DBUILD_SHARED_LIBS:BOOL=OFF
+make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
-#%make_install
-%{__make} DESTDIR=%{?buildroot:%{buildroot}} INSTALL_ROOT=%{?buildroot:%{buildroot}} install
+make DESTDIR=%{?buildroot:%{buildroot}} INSTALL_ROOT=%{?buildroot:%{buildroot}} install
 rm -f %{?buildroot:%{buildroot}}%{_infodir}/dir
 find %{?buildroot:%{buildroot}} -regex ".*\\.la$" | xargs rm -f --
 
-mkdir -p %{buildroot}/usr/share/license
-cp LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
-
-
 %files
+%manifest %{name}.manifest
+%license LICENSE.APLv2
 %{_libdir}/*.a
-%{_datadir}/license/%{name}
 
 
 %files devel
+%manifest %{name}.manifest
 %{_includedir}/*
 %{_libdir}/pkgconfig/dukgenerator.pc