summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeongmo Yang <jm80.yang@samsung.com>2017-11-30 15:27:35 +0900
committerJeongmo Yang <jm80.yang@samsung.com>2017-11-30 16:54:50 +0900
commitd6e8af94d3c938b2bee625d9ec0174c74aacef8c (patch)
tree3aaeb898a78184147b21252e38aa1c618b3d0f20
parent2abe7d6fb5819042d36e8f02328ad113eb8b449f (diff)
downloadcamera-d6e8af94d3c938b2bee625d9ec0174c74aacef8c.tar.gz
camera-d6e8af94d3c938b2bee625d9ec0174c74aacef8c.tar.bz2
camera-d6e8af94d3c938b2bee625d9ec0174c74aacef8c.zip
- Remove UI/APP framework dependencies from capi-media-camera package [Version] 0.4.1 [Profile] Common [Issue Type] Update [Dependency module] N/A Change-Id: I07aedd6ddb74d60c8c5579c00dc3b17228643c6b Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
-rw-r--r--CMakeLists.txt2
-rw-r--r--capi-media-camera-tool.manifest5
-rw-r--r--packaging/capi-media-camera.spec32
3 files changed, 22 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 186aa94..3d55870 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,9 +70,7 @@ CONFIGURE_FILE(
)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-IF(TIZEN_FEATURE_TESTSUITE)
ADD_SUBDIRECTORY(test)
-ENDIF(TIZEN_FEATURE_TESTSUITE)
IF(UNIX)
diff --git a/capi-media-camera-tool.manifest b/capi-media-camera-tool.manifest
new file mode 100644
index 0000000..a76fdba
--- /dev/null
+++ b/capi-media-camera-tool.manifest
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+ <domain name="_" />
+ </request>
+</manifest>
diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec
index 080c3bb..9666cfb 100644
--- a/packaging/capi-media-camera.spec
+++ b/packaging/capi-media-camera.spec
@@ -1,6 +1,6 @@
Name: capi-media-camera
Summary: A Camera API
-Version: 0.4.0
+Version: 0.4.1
Release: 0
Group: Multimedia/API
License: Apache-2.0
@@ -16,18 +16,14 @@ BuildRequires: pkgconfig(capi-base-common)
BuildRequires: pkgconfig(mmsvc-camera)
BuildRequires: pkgconfig(capi-media-tool)
BuildRequires: pkgconfig(libtbm)
-%if "%{TIZEN_PRODUCT_TV}" != "1"
BuildRequires: pkgconfig(appcore-efl)
BuildRequires: pkgconfig(elementary)
BuildRequires: pkgconfig(ecore)
BuildRequires: pkgconfig(evas)
-%endif
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
-
-
%description
A Camera library in Tizen Native API.
@@ -38,11 +34,18 @@ Requires: %{name} = %{version}-%{release}
Requires: pkgconfig(libtbm)
Requires: pkgconfig(capi-media-tool)
-
%description devel
Development related files for a Camera library in Tizen Native API.
+%package tool
+Summary: A Camera API testsuite
+Requires: %{name} = %{version}-%{release}
+
+%description tool
+Tizen Native camera API testsuite.
+
+
%prep
%setup -q
@@ -52,12 +55,7 @@ Development related files for a Camera library in Tizen Native API.
export CFLAGS+=" -DTIZEN_DEBUG_ENABLE"
%endif
MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} \
-%if "%{TIZEN_PRODUCT_TV}" != "1"
- -DTIZEN_FEATURE_TESTSUITE=On
-%else
- -DTIZEN_FEATURE_TESTSUITE=Off
-%endif
+%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
make %{?jobs:-j%jobs}
@@ -72,16 +70,20 @@ rm -rf %{buildroot}
%postun -p /sbin/ldconfig
+
%files
%manifest capi-media-camera.manifest
%license LICENSE.APLv2
%{_libdir}/libcapi-media-camera.so.*
-%if "%{TIZEN_PRODUCT_TV}" != "1"
-%{_bindir}/*
-%endif
%files devel
%{_includedir}/media/camera.h
%{_includedir}/media/camera_internal.h
%{_libdir}/pkgconfig/*.pc
%{_libdir}/libcapi-media-camera.so
+
+%files tool
+%manifest capi-media-camera-tool.manifest
+%license LICENSE.APLv2
+%{_bindir}/*
+