diff options
| author | InHong Han <inhong1.han@samsung.com> | 2016-11-02 16:05:13 +0900 |
|---|---|---|
| committer | InHong Han <inhong1.han@samsung.com> | 2016-11-02 16:05:33 +0900 |
| commit | a3425f6b132ed4adc61e399a63280002a06062bb (patch) | |
| tree | bd4e0fa0126fa8ff3612f84166d15f9e35147168 | |
| parent | 563312a423791d23ee3fb769fa104811edcba2ff (diff) | |
| parent | 58577c9cf3a67524c58d67b0ad16ded52341886b (diff) | |
| download | ise-engine-default-tizen_3.0.m2.tar.gz ise-engine-default-tizen_3.0.m2.tar.bz2 ise-engine-default-tizen_3.0.m2.zip | |
Merge branch 'tizen' into tizen_3.0submit/tizen_3.0_common/20161110.084657submit/tizen_3.0/20161102.065320submit/tizen_3.0.m2/20170104.093752accepted/tizen/3.0/wearable/20161102.102529accepted/tizen/3.0/tv/20161102.102421accepted/tizen/3.0/mobile/20161102.102345accepted/tizen/3.0/ivi/20161102.102632accepted/tizen/3.0/common/20161114.082106accepted/tizen/3.0.m2/wearable/20170104.143738accepted/tizen/3.0.m2/tv/20170104.143347accepted/tizen/3.0.m2/mobile/20170104.142804tizen_3.0.m2accepted/tizen_3.0.m2_wearableaccepted/tizen_3.0.m2_tvaccepted/tizen_3.0.m2_mobile
Change-Id: I90be3d44c8cfdf1cf8b2774c3be2076aeabad6ba
| -rwxr-xr-x | ise-engine-default.xml | 2 | ||||
| -rw-r--r-- | packaging/ise-engine-default.spec | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/ise-engine-default.xml b/ise-engine-default.xml index 4a944c8..c5828e4 100755 --- a/ise-engine-default.xml +++ b/ise-engine-default.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<manifest xmlns="http://tizen.org/ns/packages" api-version="2.3" package="ise-engine-default" version="1.0.5" install-location="internal-only"> +<manifest xmlns="http://tizen.org/ns/packages" api-version="2.3" package="ise-engine-default" version="1.0.6" install-location="internal-only"> <author/> <description/> <label>Default keyboard</label> diff --git a/packaging/ise-engine-default.spec b/packaging/ise-engine-default.spec index 2fb2949..d72780b 100644 --- a/packaging/ise-engine-default.spec +++ b/packaging/ise-engine-default.spec @@ -1,6 +1,6 @@ Name: ise-engine-default Summary: Multilingual Keyboard ISE -Version: 1.0.5 +Version: 1.0.6 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 @@ -17,17 +17,14 @@ it is based on Input Service Framework(ISF). %build export CFLAGS+=" -Werror" export CXXFLAGS+=" -Werror" -./bootstrap %autogen %configure --prefix=%{_prefix} --disable-static - -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install rm -rf %{buildroot} + %make_install -mkdir -p %{buildroot}%{_datadir}/license -install -m0644 %{_builddir}/%{buildsubdir}/LICENSE.APLv2 %{buildroot}%{_datadir}/license/%{name} %post @@ -39,4 +36,4 @@ install -m0644 %{_builddir}/%{buildsubdir}/LICENSE.APLv2 %{buildroot}%{_datadir} %{_libdir}/scim-1.0/1.4.0/IMEngine/ise-engine-default.so %{_datadir}/scim/icons/isf-default.png %{_datadir}/packages/* -%{_datadir}/license/%{name} +%license LICENSE.APLv2 |