diff options
| author | Jinkun Jang <jinkun.jang@samsung.com> | 2013-03-16 01:12:50 +0900 |
|---|---|---|
| committer | Jinkun Jang <jinkun.jang@samsung.com> | 2013-03-16 01:12:50 +0900 |
| commit | 70e4cdd60c8427c49d02b158418727e87939a323 (patch) | |
| tree | 6f4f67f6b6645cf2d262d7c3ac6ade203d6738a4 | |
| parent | c82f12be8df0486b6fae8ef096a41858f781bc32 (diff) | |
| download | xdgmime-70e4cdd60c8427c49d02b158418727e87939a323.tar.gz xdgmime-70e4cdd60c8427c49d02b158418727e87939a323.tar.bz2 xdgmime-70e4cdd60c8427c49d02b158418727e87939a323.zip | |
merge with mastersubmit/tizen_2.1/20130424.230953submit/tizen/20130517.044836accepted/tizen_2.1/20130425.035359accepted/tizen/20130520.1009452.1b_releasetizen_2.1
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | packaging/xdgmime.spec | 44 |
2 files changed, 21 insertions, 27 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5090db6..10c65d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,10 +74,10 @@ SET_TARGET_PROPERTIES(xdgmime PROPERTIES VERSION ${VERSION}) CONFIGURE_FILE(xdgmime.pc.in xdgmime.pc @ONLY) ### Install ### -INSTALL(TARGETS xdgmime DESTINATION lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS xdgmime DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/xdgmime/src/xdgmime.h DESTINATION include) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/xdgmime.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/xdgmime.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) # test add_subdirectory(test) diff --git a/packaging/xdgmime.spec b/packaging/xdgmime.spec index 1b74dab..9b45d4d 100644 --- a/packaging/xdgmime.spec +++ b/packaging/xdgmime.spec @@ -1,51 +1,45 @@ -Name: xdgmime -Summary: Pkg xdgmime -Version: 0.0.12 -Release: 2 -Group: TO_BE/FILLED_IN -License: LGPLv2, AFLv2 -Source0: xdgmime-%{version}.tar.gz -Requires(post): /sbin/ldconfig, /bin/chown, /bin/chmod -Requires(postun): /sbin/ldconfig +Name: xdgmime +Version: 0.0.12 +Release: 2 +License: LGPLv2, AFLv2 +Summary: Pkg xdgmime +Group: TO_BE/FILLED_IN +Source0: xdgmime-%{version}.tar.gz BuildRequires: cmake %description -Package xdgmime +Package xdgmime %package devel -Summary: Pkg xdgmime (devel) -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Summary: Pkg xdgmime (devel) +Group: Development/Libraries +Requires: %{name} = %{version} %description devel Package xdgmime (devel) %prep -%setup -q -n %{name}-%{version} +%setup -q %build -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +%cmake . -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -rm -rf %{buildroot} %make_install -%post -chown root:root /usr/lib/libxdgmime.so.1.1.0 -chmod 644 /usr/lib/libxdgmime.so.1.1.0 -/sbin/ldconfig +%post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) -/usr/lib/libxdgmime.so.* +%{_libdir}/libxdgmime.so.* %manifest xdgmime.manifest %files devel %defattr(-,root,root,-) -/usr/include/xdgmime.h -/usr/lib/libxdgmime.so -/usr/lib/pkgconfig/xdgmime.pc +%{_includedir}/xdgmime.h +%{_libdir}/libxdgmime.so +%{_libdir}/pkgconfig/xdgmime.pc |