Change Package Name 85/171785/1 submit/tizen/20180307.084520 submit/tizen/20180308.020325 submit/tizen/20180312.093157 submit/tizen/20180312.104235 submit/tizen/20180312.111441 submit/tizen/20180312.223145 submit/tizen/20180313.040146
authorKiseok Chang <kiso.chang@samsung.com>
Wed, 7 Mar 2018 08:37:52 +0000 (17:37 +0900)
committerKiseok Chang <kiso.chang@samsung.com>
Wed, 7 Mar 2018 08:39:50 +0000 (17:39 +0900)
 - package name was duplicated with mobile setting app

Change-Id: I2ad1cb6894f5d915af1af555281ede1bdf24f4e7
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>
packaging/org.tizen.setting-profile_common.spec [new file with mode: 0755]
packaging/org.tizen.setting.spec [deleted file]

diff --git a/packaging/org.tizen.setting-profile_common.spec b/packaging/org.tizen.setting-profile_common.spec
new file mode 100755 (executable)
index 0000000..a0bad3e
--- /dev/null
@@ -0,0 +1,223 @@
+%bcond_with x
+%bcond_with wayland
+
+%define alias org.tizen.setting
+
+Name:       org.tizen.setting-profile_common
+Summary:    Setting application
+Version:    1.0.1
+Release:    99
+Provides: org.tizen.setting = %{version}-%{release}
+Group:      Applications/Core Applications
+License:    Apache-2.0
+Source0:    %{name}-%{version}.tar.gz
+Source1:    packaging/firewall.service
+
+BuildRequires: pkgconfig(app2sd)
+#BuildRequires:        pkgconfig(capi-media-image-util)
+#BuildRequires:  pkgconfig(accounts-svc)
+BuildRequires:  pkgconfig(alarm-service)
+BuildRequires:  pkgconfig(appcore-common)
+BuildRequires:  pkgconfig(appcore-efl)
+BuildRequires:  pkgconfig(appsvc)
+BuildRequires:  pkgconfig(aul)
+BuildRequires:  pkgconfig(auth-fw)
+BuildRequires:  pkgconfig(callmgr_client)
+BuildRequires:  pkgconfig(bundle)
+BuildRequires:  pkgconfig(capi-appfw-application)
+BuildRequires:  pkgconfig(capi-appfw-event)
+BuildRequires:  pkgconfig(capi-appfw-preference)
+BuildRequires:  pkgconfig(capi-appfw-app-manager)
+BuildRequires:  pkgconfig(capi-appfw-package-manager)
+BuildRequires:  pkgconfig(capi-base-utils-i18n)
+BuildRequires:  pkgconfig(capi-content-media-content)
+BuildRequires:  pkgconfig(capi-network-bluetooth)
+BuildRequires:  pkgconfig(capi-network-wifi-manager)
+BuildRequires:  pkgconfig(capi-media-metadata-extractor)
+BuildRequires:  pkgconfig(capi-media-player)
+BuildRequires:  pkgconfig(capi-media-sound-manager)
+BuildRequires:  pkgconfig(capi-system-device)
+BuildRequires:  pkgconfig(capi-system-info)
+BuildRequires:  pkgconfig(capi-system-runtime-info)
+#BuildRequires:  pkgconfig(capi-system-sensor)
+BuildRequires:  pkgconfig(capi-system-system-settings)
+BuildRequires:  pkgconfig(capi-telephony)
+BuildRequires:  pkgconfig(chromium-efl)
+BuildRequires:  pkgconfig(deviced)
+BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(dpm)
+BuildRequires:  pkgconfig(efl-extension)
+BuildRequires:  pkgconfig(edbus)
+BuildRequires:  pkgconfig(elementary)
+BuildRequires:  pkgconfig(feedback)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(iniparser)
+BuildRequires:  pkgconfig(json-glib-1.0)
+#BuildRequires:  pkgconfig(ode)
+BuildRequires:  pkgconfig(libtzplatform-config)
+BuildRequires:  pkgconfig(libxml-2.0)
+#BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(pkgmgr)
+BuildRequires:  pkgconfig(pkgmgr-info)
+BuildRequires:  pkgconfig(privilege-info)
+BuildRequires:  pkgconfig(security-privilege-manager)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(storage)
+BuildRequires:  pkgconfig(tapi)
+BuildRequires:  pkgconfig(tts)
+#BuildRequires:  pkgconfig(tts-setting)
+#BuildRequires:  pkgconfig(ui-gadget-1)
+BuildRequires:  pkgconfig(vconf)
+#BuildRequires:  pkgconfig(context)
+BuildRequires:  pkgconfig(minizip)
+BuildRequires:  libcap-devel
+BuildRequires:  cmake
+BuildRequires:  edje-tools
+BuildRequires:  gettext-tools
+BuildRequires:  hash-signer
+Requires(post): attr
+
+%description
+Setting application
+ BEAT UI, Setting application.
+
+%package ref
+Summary: Replacement for org.tizen.setting.xml
+Group: Applications/Core Applications
+Requires(post): org.tizen.setting
+
+%description ref
+replace for org.tizen.setting.xml
+ need to check
+
+%prep
+mkdir -p %{buildroot}%{TZ_SYS_SHARE}/settings
+%setup -q
+
+%build
+
+%define PREFIX         %{_prefix}/apps/org.tizen.setting
+%define OPTPREFIX      %{TZ_SYS_RW_APP}/org.tizen.setting
+%define RESDIR         %{PREFIX}/res
+%define CONFIGDIR      %{PREFIX}/def_config
+%define IMAGEDIR       %{RESDIR}/images
+CFLAGS+=" -fvisibility=hidden ";export CFLAGS
+CXXFLAGS+=" -fvisibility=hidden ";export CFLAGS
+
+LDFLAGS+="-Wl,--rpath=%{PREFIX}/lib -Wl,--hash-style=both -Wl,--as-needed";export LDFLAGS
+
+%if 0%{?sec_build_binary_debug_enable}
+export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
+export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
+export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
+%endif
+
+%if 0%{?tizen_build_binary_release_type_eng}
+export CFLAGS="$CFLAGS -DTIZEN_ENGINEER_MODE"
+export CXXFLAGS="$CXXFLAGS -DTIZEN_ENGINEER_MODE"
+export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE"
+%endif
+
+%ifarch %{arm}
+export CFLAGS="$CFLAGS -DTIZEN_BUILD_TARGET"
+%else
+export CFLAGS="$CFLAGS -DTIZEN_BUILD_EMULATOR"
+%endif
+
+%ifarch %{arm}
+       cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DARCH=arm -DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir} \
+%else
+       cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DARCH=x86 -DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir} \
+%endif
+%if 0%{?tizen_build_binary_release_type_eng}
+               -DBINARY_RELEASE_TYPE_ENG=YES \
+%endif
+               -DTZ_SYS_DATA=%{TZ_SYS_DATA} \
+               -DTZ_SYS_ETC=%{TZ_SYS_ETC} \
+               -DTZ_SYS_SHARE=%{TZ_SYS_SHARE} \
+               -DTZ_SYS_RO_APP=%{TZ_SYS_RO_APP} \
+               -DTZ_SYS_RW_APP=%{TZ_SYS_RW_APP} \
+               -DTZ_SYS_RO_UG=%{TZ_SYS_RO_UG} \
+               -DTZ_SYS_RO_ICONS=%{TZ_SYS_RO_ICONS} \
+               -DTZ_SYS_MEDIA=%{TZ_SYS_MEDIA} \
+               -DTZ_SYS_DB=%{TZ_SYS_DB} \
+               -DTZ_SYS_GLOBALUSER_DATA=%{TZ_SYS_GLOBALUSER_DATA}
+# build all
+make
+
+%install
+rm -rf %{buildroot}
+%make_install
+
+%define tizen_sign 1
+%define tizen_sign_base %{PREFIX}
+%define tizen_sign_level platform
+%define tizen_author_sign 1
+%define tizen_dist_sign 1
+%find_lang setting
+
+mkdir -p %{buildroot}%{_prefix}/apps/org.tizen.mode-syspopup/data
+mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
+mkdir -p %{buildroot}%{_libdir}/systemd/system/default.target.wants
+
+%clean
+
+%post
+/sbin/ldconfig
+
+update-mime-database %{_prefix}/share/mime
+
+# Set vconf values with -g/-u options
+GOPTION="-g 6514"
+
+#resetSound
+DEFAULT_CALL_TONE="%{TZ_SYS_SHARE}/settings/Ringtones/ringtone_sdk.mp3"
+DEFAULT_NOTI_TONE="%{TZ_SYS_SHARE}/Alerts/General notification_sdk.wav"
+
+#resetImages
+DEFAULT_HOME="%{TZ_SYS_SHARE}/Wallpapers/home_001.png"
+DEFAULT_LOCK="%{TZ_SYS_SHARE}/Wallpapers/home_003.png"
+
+#resetSecurity
+rm -rf {_prefix}/data/setting/set_info
+
+#reset configuration
+rm -f /opt/home/owner/apps_rw/org.tizen.setting/data/setting.cfg
+
+sync
+
+mkdir -p %{_prefix}/ug/bin/
+# help directory
+mkdir -p %{PREFIX}/shared
+mkdir -p %{PREFIX}/shared/res
+mkdir -p %{_prefix}/apps/org.tizen.mode-syspopup/res/edje
+mkdir -p %{_prefix}/apps/org.tizen.mode-syspopup/bin/
+
+%postun -p /sbin/ldconfig
+
+%files -f setting.lang
+%manifest org.tizen.setting.manifest
+
+%{PREFIX}/author-signature.xml
+%{PREFIX}/signature1.xml
+
+# Firewall -------------------------------------------------------
+%{_sysconfdir}/opt/upgrade/583.org.tizen.setting.patch.sh
+
+%defattr(-,root,root,-)
+
+%{PREFIX}/bin/*
+%{CONFIGDIR}/*
+
+%{_libdir}/lib*.so
+%{_libdir}/lib*.so.*
+%{_datadir}/packages/org.tizen.setting.xml
+%{_datadir}/icons/default/small/org.tizen.setting.png
+%{_datadir}/mime/packages/mime.setting.xml
+
+%{PREFIX}/res/edje/*
+%{PREFIX}/res/icons/*
+%{PREFIX}/res/images/*
+
+%{TZ_SYS_GLOBALUSER_DATA}/settings/*
+
diff --git a/packaging/org.tizen.setting.spec b/packaging/org.tizen.setting.spec
deleted file mode 100755 (executable)
index 5e4d867..0000000
+++ /dev/null
@@ -1,220 +0,0 @@
-%bcond_with x
-%bcond_with wayland
-
-Name:       org.tizen.setting
-Summary:    Setting application
-Version:    1.0.1
-Release:    99
-Group:      Applications/Core Applications
-License:    Apache-2.0
-Source0:    %{name}-%{version}.tar.gz
-Source1:    packaging/firewall.service
-
-BuildRequires: pkgconfig(app2sd)
-#BuildRequires:        pkgconfig(capi-media-image-util)
-#BuildRequires:  pkgconfig(accounts-svc)
-BuildRequires:  pkgconfig(alarm-service)
-BuildRequires:  pkgconfig(appcore-common)
-BuildRequires:  pkgconfig(appcore-efl)
-BuildRequires:  pkgconfig(appsvc)
-BuildRequires:  pkgconfig(aul)
-BuildRequires:  pkgconfig(auth-fw)
-BuildRequires:  pkgconfig(callmgr_client)
-BuildRequires:  pkgconfig(bundle)
-BuildRequires:  pkgconfig(capi-appfw-application)
-BuildRequires:  pkgconfig(capi-appfw-event)
-BuildRequires:  pkgconfig(capi-appfw-preference)
-BuildRequires:  pkgconfig(capi-appfw-app-manager)
-BuildRequires:  pkgconfig(capi-appfw-package-manager)
-BuildRequires:  pkgconfig(capi-base-utils-i18n)
-BuildRequires:  pkgconfig(capi-content-media-content)
-BuildRequires:  pkgconfig(capi-network-bluetooth)
-BuildRequires:  pkgconfig(capi-network-wifi-manager)
-BuildRequires:  pkgconfig(capi-media-metadata-extractor)
-BuildRequires:  pkgconfig(capi-media-player)
-BuildRequires:  pkgconfig(capi-media-sound-manager)
-BuildRequires:  pkgconfig(capi-system-device)
-BuildRequires:  pkgconfig(capi-system-info)
-BuildRequires:  pkgconfig(capi-system-runtime-info)
-#BuildRequires:  pkgconfig(capi-system-sensor)
-BuildRequires:  pkgconfig(capi-system-system-settings)
-BuildRequires:  pkgconfig(capi-telephony)
-BuildRequires:  pkgconfig(chromium-efl)
-BuildRequires:  pkgconfig(deviced)
-BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(dpm)
-BuildRequires:  pkgconfig(efl-extension)
-BuildRequires:  pkgconfig(edbus)
-BuildRequires:  pkgconfig(elementary)
-BuildRequires:  pkgconfig(feedback)
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(iniparser)
-BuildRequires:  pkgconfig(json-glib-1.0)
-#BuildRequires:  pkgconfig(ode)
-BuildRequires:  pkgconfig(libtzplatform-config)
-BuildRequires:  pkgconfig(libxml-2.0)
-#BuildRequires:  pkgconfig(openssl)
-BuildRequires:  pkgconfig(pkgmgr)
-BuildRequires:  pkgconfig(pkgmgr-info)
-BuildRequires:  pkgconfig(privilege-info)
-BuildRequires:  pkgconfig(security-privilege-manager)
-BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(storage)
-BuildRequires:  pkgconfig(tapi)
-BuildRequires:  pkgconfig(tts)
-#BuildRequires:  pkgconfig(tts-setting)
-#BuildRequires:  pkgconfig(ui-gadget-1)
-BuildRequires:  pkgconfig(vconf)
-#BuildRequires:  pkgconfig(context)
-BuildRequires:  pkgconfig(minizip)
-BuildRequires:  libcap-devel
-BuildRequires:  cmake
-BuildRequires:  edje-tools
-BuildRequires:  gettext-tools
-BuildRequires:  hash-signer
-Requires(post): attr
-
-%description
-Setting application
- BEAT UI, Setting application.
-
-%package ref
-Summary: Replacement for org.tizen.setting.xml
-Group: Applications/Core Applications
-Requires(post): org.tizen.setting
-
-%description ref
-replace for org.tizen.setting.xml
- need to check
-
-%prep
-mkdir -p %{buildroot}%{TZ_SYS_SHARE}/settings
-%setup -q
-
-%build
-
-%define PREFIX         %{_prefix}/apps/org.tizen.setting
-%define OPTPREFIX      %{TZ_SYS_RW_APP}/org.tizen.setting
-%define RESDIR         %{PREFIX}/res
-%define CONFIGDIR      %{PREFIX}/def_config
-%define IMAGEDIR       %{RESDIR}/images
-CFLAGS+=" -fvisibility=hidden ";export CFLAGS
-CXXFLAGS+=" -fvisibility=hidden ";export CFLAGS
-
-LDFLAGS+="-Wl,--rpath=%{PREFIX}/lib -Wl,--hash-style=both -Wl,--as-needed";export LDFLAGS
-
-%if 0%{?sec_build_binary_debug_enable}
-export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
-export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
-export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
-%endif
-
-%if 0%{?tizen_build_binary_release_type_eng}
-export CFLAGS="$CFLAGS -DTIZEN_ENGINEER_MODE"
-export CXXFLAGS="$CXXFLAGS -DTIZEN_ENGINEER_MODE"
-export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE"
-%endif
-
-%ifarch %{arm}
-export CFLAGS="$CFLAGS -DTIZEN_BUILD_TARGET"
-%else
-export CFLAGS="$CFLAGS -DTIZEN_BUILD_EMULATOR"
-%endif
-
-%ifarch %{arm}
-       cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DARCH=arm -DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir} \
-%else
-       cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DARCH=x86 -DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir} \
-%endif
-%if 0%{?tizen_build_binary_release_type_eng}
-               -DBINARY_RELEASE_TYPE_ENG=YES \
-%endif
-               -DTZ_SYS_DATA=%{TZ_SYS_DATA} \
-               -DTZ_SYS_ETC=%{TZ_SYS_ETC} \
-               -DTZ_SYS_SHARE=%{TZ_SYS_SHARE} \
-               -DTZ_SYS_RO_APP=%{TZ_SYS_RO_APP} \
-               -DTZ_SYS_RW_APP=%{TZ_SYS_RW_APP} \
-               -DTZ_SYS_RO_UG=%{TZ_SYS_RO_UG} \
-               -DTZ_SYS_RO_ICONS=%{TZ_SYS_RO_ICONS} \
-               -DTZ_SYS_MEDIA=%{TZ_SYS_MEDIA} \
-               -DTZ_SYS_DB=%{TZ_SYS_DB} \
-               -DTZ_SYS_GLOBALUSER_DATA=%{TZ_SYS_GLOBALUSER_DATA}
-# build all
-make
-
-%install
-rm -rf %{buildroot}
-%make_install
-
-%define tizen_sign 1
-%define tizen_sign_base %{PREFIX}
-%define tizen_sign_level platform
-%define tizen_author_sign 1
-%define tizen_dist_sign 1
-%find_lang setting
-
-mkdir -p %{buildroot}%{_prefix}/apps/org.tizen.mode-syspopup/data
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-mkdir -p %{buildroot}%{_libdir}/systemd/system/default.target.wants
-
-%clean
-
-%post
-/sbin/ldconfig
-
-update-mime-database %{_prefix}/share/mime
-
-# Set vconf values with -g/-u options
-GOPTION="-g 6514"
-
-#resetSound
-DEFAULT_CALL_TONE="%{TZ_SYS_SHARE}/settings/Ringtones/ringtone_sdk.mp3"
-DEFAULT_NOTI_TONE="%{TZ_SYS_SHARE}/Alerts/General notification_sdk.wav"
-
-#resetImages
-DEFAULT_HOME="%{TZ_SYS_SHARE}/Wallpapers/home_001.png"
-DEFAULT_LOCK="%{TZ_SYS_SHARE}/Wallpapers/home_003.png"
-
-#resetSecurity
-rm -rf {_prefix}/data/setting/set_info
-
-#reset configuration
-rm -f /opt/home/owner/apps_rw/org.tizen.setting/data/setting.cfg
-
-sync
-
-mkdir -p %{_prefix}/ug/bin/
-# help directory
-mkdir -p %{PREFIX}/shared
-mkdir -p %{PREFIX}/shared/res
-mkdir -p %{_prefix}/apps/org.tizen.mode-syspopup/res/edje
-mkdir -p %{_prefix}/apps/org.tizen.mode-syspopup/bin/
-
-%postun -p /sbin/ldconfig
-
-%files -f setting.lang
-%manifest org.tizen.setting.manifest
-
-%{PREFIX}/author-signature.xml
-%{PREFIX}/signature1.xml
-
-# Firewall -------------------------------------------------------
-%{_sysconfdir}/opt/upgrade/583.org.tizen.setting.patch.sh
-
-%defattr(-,root,root,-)
-
-%{PREFIX}/bin/*
-%{CONFIGDIR}/*
-
-%{_libdir}/lib*.so
-%{_libdir}/lib*.so.*
-%{_datadir}/packages/org.tizen.setting.xml
-%{_datadir}/icons/default/small/org.tizen.setting.png
-%{_datadir}/mime/packages/mime.setting.xml
-
-%{PREFIX}/res/edje/*
-%{PREFIX}/res/icons/*
-%{PREFIX}/res/images/*
-
-%{TZ_SYS_GLOBALUSER_DATA}/settings/*
-