Open Build Service

Changes of Revision 15

_service:tar_scm_kernel_repo:generic-release.spec Changed

@@ -6,7 +6,7 @@
 %define generic_version 20.03
 %define generic_patch_level LTS
 %define generic_patch_level_extend SP3
-%define generic_release 55
+%define generic_release 54
 %define builtin_release_version 1.0
 
 %define current_arch %{_arch}
@@ -39,11 +39,18 @@
 BuildRequires:	python
 Requires:  %{product_family}-repos 
 Requires:  %{product_family}-release-custom
-Obsoletes: 	yum-utils yum-utils-help yum-utils-plugins %{product_family}-performance
+Obsoletes: 	yum-utils yum-utils-help yum-utils-plugins
 
 %description
 %{product_family} release files
 
+%package -n %{product_family}-performance
+Requires:   coreutils systemd setup
+
+Summary:         performance script
+%description -n %{product_family}-performance
+performance script
+
 %package -n %{product_family}-rootfiles
 Summary:         Basic required files for the root user's account
 BuildArch:       noarch
@@ -111,6 +118,7 @@
 mkdir -p -m 755 $RPM_BUILD_ROOT/etc/profile.d
 cp -a color.sh $RPM_BUILD_ROOT/etc/profile.d/
 cp -a system-info.sh $RPM_BUILD_ROOT/etc/profile.d/
+cp -a performance.sh $RPM_BUILD_ROOT/etc/profile.d/
 
 # write cpe to /etc/system/release-cpe
 echo "cpe:/o:%{product_family}:%{product_family}:%{version}:ga:server" > $RPM_BUILD_ROOT/etc/system-release-cpe
@@ -159,13 +167,6 @@
 install -p -m 644 %{SOURCE7} %{buildroot}/root/.tcshrc
 install -p -m 644 %{SOURCE8} %{buildroot}/root/.cshrc
 
-%post
-rpm -q openEuler-performance > /dev/null
-if [ $? -eq 0 ]; then
-  cp /etc/profile.d/performance.sh /etc/profile.d/performance.sh.bak
-  echo -e "\033[31m Attention: openEuler-performance package files are backed up to /etc/profile.d/performance.sh.bak \033[0m"
-fi
-
 %posttrans -n %{product_family}-rootfiles
 if [ $1 -eq 0 ] ; then
         cp -ndr --preserve=ownership,timestamps /etc/skel/. /root/ || :
@@ -191,6 +192,10 @@
 /var/lib/supportinfo
 /usr/share/eula/eula.*
 
+%files -n %{product_family}-performance
+%defattr(0644,root,root,0755)
+/etc/profile.d/performance.sh
+
 %files -n %{product_family}-rootfiles
 %config(noreplace) /root/.bashrc
 %config(noreplace) /root/.bash_profile
@@ -201,9 +206,6 @@
 %files -n %{product_family}-release-custom
 
 %changelog
-* Mon Dec 12 2022 wangkai <wangkai385@h-partners.com> - 1.0-55
-- Delete package openEuler-performance
-
 * Tue Nov 8 2022 liyanan <liyanan32@h-partners.com> - 1.0-54
 - fix release-custom uninstall error