projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Libraries & RPM renamed to provide DALi 2" into devel/master
[platform/core/uifw/dali-core.git]
/
packaging
/
dali.spec
diff --git
a/packaging/dali.spec
b/packaging/dali.spec
index
3d3a9a7
..
3f8d1a8
100644
(file)
--- a/
packaging/dali.spec
+++ b/
packaging/dali.spec
@@
-1,6
+1,6
@@
-Name: dali
+Name: dali
2
Summary: DALi 3D Engine
Summary: DALi 3D Engine
-Version: 1.
4.33
+Version: 1.
9.10
Release: 1
Group: System/Libraries
License: Apache-2.0 and BSD-3-Clause and MIT
Release: 1
Group: System/Libraries
License: Apache-2.0 and BSD-3-Clause and MIT
@@
-10,7
+10,6
@@
Source0: %{name}-%{version}.tar.gz
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
BuildRequires: cmake
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
BuildRequires: cmake
-BuildRequires: lcov
BuildRequires: pkgconfig
BuildRequires: gawk
BuildRequires: pkgconfig
BuildRequires: gawk
@@
-83,7
+82,9
@@
cmake \
%if 0%{?enable_trace}
-DENABLE_TRACE=ON \
%endif
%if 0%{?enable_trace}
-DENABLE_TRACE=ON \
%endif
- -DCMAKE_INSTALL_PREFIX=%{_prefix}
+ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+ -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
+ -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}
make %{?jobs:-j%jobs}
make %{?jobs:-j%jobs}
@@
-97,13
+98,6
@@
cd build/tizen
pushd %{_builddir}/%{name}-%{version}/build/tizen
%make_install
pushd %{_builddir}/%{name}-%{version}/build/tizen
%make_install
-# Create links to ensure linking with cxx11 library is preserved
-pushd %{buildroot}%{_libdir}
-ln -sf libdali-core.so libdali-core-cxx11.so
-ln -sf libdali-core.so libdali-core-cxx11.so.0
-ln -sf libdali-core.so libdali-core-cxx11.so.0.0.0
-popd
-
##############################
# Post Install
##############################
##############################
# Post Install
##############################
@@
-129,13
+123,12
@@
exit 0
%manifest dali.manifest
%endif
%defattr(-,root,root,-)
%manifest dali.manifest
%endif
%defattr(-,root,root,-)
-%{_libdir}/libdali-core-cxx11.so*
-%{_libdir}/libdali-core.so*
+%{_libdir}/libdali2-core.so*
%license LICENSE
%files devel
%defattr(-,root,root,-)
%license LICENSE
%files devel
%defattr(-,root,root,-)
-%{_libdir}/pkgconfig/dali-core.pc
+%{_libdir}/pkgconfig/dali
2
-core.pc
%{dev_include_path}/dali/public-api/*
%{dev_include_path}/dali/devel-api/*
%{dev_include_path}/dali/doc/*
%{dev_include_path}/dali/public-api/*
%{dev_include_path}/dali/devel-api/*
%{dev_include_path}/dali/doc/*