From 36f38d3ff5f22d9877815f17674d0d9802a5c501 Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Fri, 31 Aug 2018 19:43:54 +0900 Subject: [PATCH] Minor fix to remove Conflicts: system-servant-extension-profile_ivi + Add .gitignore Change-Id: I53f853174f4785fa56b39c81364998aeb8f2c52e Signed-off-by: Hyotaek Shim --- .gitignore | 3 +++ packaging/system-servant.spec | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9306ae6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +cscope.files +cscope.out +tags diff --git a/packaging/system-servant.spec b/packaging/system-servant.spec index 9615881..8008bdb 100755 --- a/packaging/system-servant.spec +++ b/packaging/system-servant.spec @@ -52,7 +52,6 @@ Provides: system-servant-compat = %{version}-%{release} Conflicts: system-servant-profile_mobile Conflicts: system-servant-extension-rectangle-profile_wearable Conflicts: system-servant-extension-circle-profile_wearable -Conflicts: system-servant-extension-profile_ivi Conflicts: system-servant-extension-profile_tv %description profile_common System-popup (system-servant) configured for common profile. @@ -66,7 +65,6 @@ Conflicts: system-servant-profile_mobile Conflicts: system-servant-extension-rectangle-profile_wearable Conflicts: system-servant-extension-circle-profile_wearable Conflicts: system-servant-profile_common -Conflicts: system-servant-extension-profile_ivi %description profile_tv System-popup (system-servant) configured for TV profile. The binary is shared between common/tv. @@ -82,7 +80,6 @@ Requires: org.tizen.system-syspopup.mobile Conflicts: system-servant-extension-rectangle-profile_wearable Conflicts: system-servant-extension-circle-profile_wearable Conflicts: system-servant-profile_common -Conflicts: system-servant-extension-profile_ivi Conflicts: system-servant-extension-profile_tv %description profile_mobile System-popup (system-servant) configured for mobile profile. @@ -101,7 +98,6 @@ Provides: system-servant-compat Conflicts: system-servant-profile_mobile Conflicts: system-servant-extension-rectangle-profile_wearable Conflicts: system-servant-profile_common -Conflicts: system-servant-extension-profile_ivi Conflicts: system-servant-extension-profile_tv %description extension-circle-profile_wearable System-popup (system-servant) configured for wearable profile. @@ -118,7 +114,6 @@ Provides: system-servant-compat Conflicts: system-servant-profile_mobile Conflicts: system-servant-extension-circle-profile_wearable Conflicts: system-servant-profile_common -Conflicts: system-servant-extension-profile_ivi Conflicts: system-servant-extension-profile_tv %description extension-rectangle-profile_wearable System-popup (system-servant) configured for wearable profile. -- 2.7.4