X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Forg.tizen.quickpanel.spec;h=6e2fdc5425c4e41ffbc59043b21e80a05af88123;hb=refs%2Fchanges%2F41%2F61941%2F1;hp=545be5354ed76976ca8a19c07f4056b8ae47d15f;hpb=62ff8a662674ba1c733ea8153474dfc71f2705a4;p=apps%2Fcore%2Fpreloaded%2Fquickpanel.git diff --git a/packaging/org.tizen.quickpanel.spec b/packaging/org.tizen.quickpanel.spec index 545be53..6e2fdc5 100755 --- a/packaging/org.tizen.quickpanel.spec +++ b/packaging/org.tizen.quickpanel.spec @@ -10,12 +10,7 @@ License: Apache-2.0 Source0: %{name}-%{version}.tar.gz Source102: quickpanel-system.service Source104: quickpanel-system.path - -%if %{with wayland} -Source103: org.tizen.quickpanel.manifest.3.0 -%else -Source103: org.tizen.quickpanel.manifest.2.4 -%endif +Source103: org.tizen.quickpanel.manifest %if "%{?profile}" == "wearable" ExcludeArch: %{arm} %ix86 x86_64 @@ -61,15 +56,7 @@ BuildRequires: pkgconfig(minicontrol-monitor) BuildRequires: pkgconfig(iniparser) BuildRequires: pkgconfig(capi-appfw-package-manager) BuildRequires: pkgconfig(alarm-service) -%if %{with wayland} BuildRequires: pkgconfig(ecore-wayland) -%else -BuildRequires: pkgconfig(inputproto) -BuildRequires: pkgconfig(xi) -BuildRequires: pkgconfig(utilX) -BuildRequires: pkgconfig(ecore-x) -BuildRequires: pkgconfig(libprivilege-control) -%endif BuildRequires: pkgconfig(voice-control-setting) BuildRequires: pkgconfig(tzsh-quickpanel-service) BuildRequires: gettext-tools @@ -99,16 +86,10 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" LDFLAGS+="-Wl,--rpath=%{name}/lib -Wl,--as-needed"; export LDFLAGS - -%if %{with wayland} export WINSYS="wayland" export WAYLAND_SUPPORT=On export X11_SUPPORT=Off -%else -export WAYLAND_SUPPORT=Off -export X11_SUPPORT=On -export WINSYS="x11" -%endif + %cmake . -DPKGNAME=%{name} -DWINSYS=${WINSYS} make %{?jobs:-j%jobs} @@ -137,8 +118,3 @@ ln -s ../quickpanel.path %{buildroot}%{__usrdir}/default.target.wants/ %{__usrdir}/quickpanel.service %{__usrdir}/quickpanel.path %{_prefix}/share/license/%{name} -%if %{with wayland} -# Do not install the SMACK Rule file for Tizen 3.x -%else -%{_sysconfdir}/smack/accesses.d/%{name}.efl -%endif