diff options
| author | Sung-Jin Park <sj76.park@samsung.com> | 2016-04-06 14:32:10 +0900 |
|---|---|---|
| committer | Sung-Jin Park <sj76.park@samsung.com> | 2016-04-06 14:32:10 +0900 |
| commit | a2c62c2bbfffee6cd9d8f3ae4d3c31da50d78137 (patch) | |
| tree | 71bdb45e8213a9c03fa49d75283c3e18eb2c0c47 | |
| parent | 4e2e1fbc347948d70a65535f81f523af815bc8b9 (diff) | |
| download | xkeyboard-config-a2c62c2bbfffee6cd9d8f3ae4d3c31da50d78137.tar.gz xkeyboard-config-a2c62c2bbfffee6cd9d8f3ae4d3c31da50d78137.tar.bz2 xkeyboard-config-a2c62c2bbfffee6cd9d8f3ae4d3c31da50d78137.zip | |
Fix .spec file to remove common profile check syntaxsubmit/tizen/20160406.062331
Change-Id: I18a96d0999c92eab6ec4f5b89b08a3cadcfe5efc
| -rw-r--r-- | packaging/xkeyboard-config.spec | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/packaging/xkeyboard-config.spec b/packaging/xkeyboard-config.spec index 601202ea..24076128 100644 --- a/packaging/xkeyboard-config.spec +++ b/packaging/xkeyboard-config.spec @@ -24,10 +24,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Requires(pre): /usr/bin/ln Requires(pre): /usr/bin/rm -%if "%{?profile}" == "common" -%else BuildRequires: xkb-tizen-data -%endif BuildRequires: pkgconfig(xkbcommon) %global TZ_SYS_RO_SHARE %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE}%{!?TZ_SYS_RO_SHARE:/usr/share} @@ -45,8 +42,6 @@ make keyboards more accessible to people with physical impairments. %setup -q cp %{SOURCE1001} . export TIZEN_PROFILE="%{?profile}" -%if "%{?profile}" == "common" -%else %if %{with x} export TIZEN_WINDOW_SYSTEM="x11" @@ -57,7 +52,6 @@ export TIZEN_WINDOW_SYSTEM="wayland" export TZ_SYS_RO_SHARE="%{TZ_SYS_RO_SHARE}" ./make_keycodes.sh ./make_symbols.sh -%endif %build %autogen --with-xkb-rules-symlink=xfree86,xorg \ @@ -78,8 +72,7 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/xkb/compiled/ ln -snf %{TZ_SYS_VAR}/lib/xkb/compiled/ %{buildroot}%{_datadir}/X11/xkb/compiled %find_lang %{name} %fdupes -s %{buildroot}%{_datadir}/X11/xkb -%if "%{?profile}" == "common" -%else + cp -af %{buildroot}/%{TZ_SYS_RO_SHARE}/X11/xkb/rules/evdev %{buildroot}/%{TZ_SYS_RO_SHARE}/X11/xkb/rules/tizen_"%{?profile}" mv -f %{buildroot}/%{TZ_SYS_RO_SHARE}/X11/xkb/rules/evdev %{buildroot}/%{TZ_SYS_RO_SHARE}/X11/xkb/rules/evdev.org sed -i 's/evdev/tizen_%{?profile}/g' %{buildroot}/%{TZ_SYS_RO_SHARE}/X11/xkb/rules/tizen_"%{?profile}" @@ -95,7 +88,6 @@ cp *.xkb %{buildroot}/%{TZ_SYS_VAR}/lib/xkb/ #for license notification mkdir -p %{buildroot}/%{TZ_SYS_RO_SHARE}/license cp -a %{_builddir}/%{buildsubdir}/COPYING %{buildroot}/%{TZ_SYS_RO_SHARE}/license/%{name} -%endif %files -f %{name}.lang %manifest %{name}.manifest |