resourced.spec: revert "Undo modification of light package" 90/291590/2
authorUnsung Lee <unsung.lee@samsung.com>
Wed, 19 Apr 2023 01:43:24 +0000 (10:43 +0900)
committerChanwoo Choi <cw00.choi@samsung.com>
Wed, 19 Apr 2023 02:19:52 +0000 (02:19 +0000)
This reverts commit 6a493507d964637b89b5b6d69208189609de5e33.
This is because light package requires bin package, so even if the light package
is empty, there is no problem at all.

Change-Id: I133ec3bf45919d8e3d955ca17a6508a149e9a594
Signed-off-by: Unsung Lee <unsung.lee@samsung.com>
packaging/resourced.spec

index efbbb63..d8cdb90 100644 (file)
@@ -43,11 +43,8 @@ BuildRequires:  pkgconfig(capi-system-resource)
 BuildRequires:  pkgconfig(cmocka)
 BuildRequires:  pkgconfig(libsyscommon)
 BuildRequires:  pkgconfig(plugin-api-resourced)
-
-Requires(post): %{_sbindir}/update-alternatives
-Requires(preun): %{_sbindir}/update-alternatives
-
 BuildRequires: gperf
+
 # for swap plugin
 Requires:      %{_sbindir}/mkswap
 Requires:      %{_bindir}/dd
@@ -71,8 +68,6 @@ Requires:     %{name}-watchdog-handler = %{version}-%{release}
 
 %package       bin
 Summary:       Resourced binary
-Requires(post): %{_sbindir}/update-alternatives
-Requires(preun): %{_sbindir}/update-alternatives
 %description   bin
 
 %package       private-api-devel
@@ -123,7 +118,7 @@ pushd build
         -DRD_CONFIG_PATH=%{confdir}                      \
         -DRD_PLUGIN_PATH=%{plugindir}                    \
         -DRD_TESTS_PATH=%{_libdir}/resourced-tests       \
-        -DRD_BINARY_NAME=resourced.common                \
+        -DRD_BINARY_NAME=resourced                       \
         %{?asan:-DASAN_BUILD=True}
 
 make %{?jobs:-j%jobs}
@@ -137,14 +132,6 @@ mkdir -p %{buildroot}/%{TZ_SYS_GLOBALUSER_DATA}/heart
 mkdir -p %{buildroot}/%{TZ_SYS_GLOBALUSER_DB}
 popd
 
-%post bin
-%{_sbindir}/update-alternatives --install %{_bindir}/resourced %{name} %{_bindir}/resourced.common 100
-
-%preun bin
-if [ $1 -eq 0 ]; then
-       %{_sbindir}/update-alternatives --remove %{name} %{_bindir}/resourced.common
-fi
-
 %post config-tv
 mv %{confdir}/optimizer-profile-tv.conf %{confdir}/optimizer.conf
 
@@ -164,8 +151,8 @@ mv %{confdir}/optimizer-profile-tv.conf %{confdir}/optimizer.conf
 %license LICENSE
 %manifest resourced.manifest
 %{_libdir}/libresourced-private-api.so.*
-%ghost %{_bindir}/resourced
-%attr(-,root, root) %{_bindir}/resourced.common
+%{_bindir}/resourced
+%attr(-,root, root) %{_bindir}/resourced
 %attr(700, root, root) %{TZ_SYS_ETC}/dump.d/module.d/dump_heart_data.sh
 
 %files config
@@ -195,7 +182,6 @@ mv %{confdir}/optimizer-profile-tv.conf %{confdir}/optimizer.conf
 
 %files light
 %manifest resourced.manifest
-%ghost %{_bindir}/resourced
 
 %files private-api-devel
 %manifest resourced.manifest