From 55090a3ca6b617d1e51d4665ebc9ae157ca6727e Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Thu, 2 Oct 2025 10:42:46 +0800 Subject: [PATCH] cleanup spec --- powerapi.spec | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/powerapi.spec b/powerapi.spec index 267f9b0..70fd225 100644 --- a/powerapi.spec +++ b/powerapi.spec @@ -1,30 +1,36 @@ Name: powerapi Version: 1.2.0 -Release: 1 +Release: 2 Summary: The ability to support openEuler power consumption control. License: MulanPSL-2.0 URL: https://gitee.com/openeuler/powerapi/ Source0: %{name}-%{version}.tar.gz -BuildRequires: gcc,cmake,zip,unzip -Requires: tar,ipmitool,psmisc,systemd,perf +BuildRequires: gcc +BuildRequires: cmake >= 3.16 +BuildRequires: rpm_macro(_unitdir) +Requires: tar,ipmitool,psmisc,perf +%{?systemd_requires} +Conflicts: %{name}-devel < 1.2.0-2 %description Including a power API SO and the Power API Service. -%package -n powerapi-devel +%package devel Summary: The ability to support openEuler power consumption control. -BuildRequires: gcc,cmake,zip,unzip -Requires: tar,ipmitool,psmisc,systemd,perf,powerapi +Requires: %{name} = %{version}-%{release} -%description -n powerapi-devel +%description devel Contains the client and server components and API header files for powerapi integration development. %prep %autosetup -p1 +# hardcoded O0 conflicts with fortify setting +grep '\-O0' * -lr | xargs sed -i -e 's/-O0//g' -e 's/-Werror//g' %build +%set_build_flags sh build.sh release %install @@ -32,35 +38,41 @@ install -d %{buildroot}/%{_sysconfdir}/sysconfig/pwrapis cp release/pwrapis/conf/pwrapis_config.ini %{buildroot}/%{_sysconfdir}/sysconfig/pwrapis install -d %{buildroot}/%{_sbindir} cp release/pwrapis/pwrapis %{buildroot}/%{_sbindir} -install -d %{buildroot}/%{_sysconfdir}/systemd/system -cp pwrapis/pwrapis.service %{buildroot}/%{_sysconfdir}/systemd/system +install -d %{buildroot}/%{_unitdir} +cp pwrapis/pwrapis.service %{buildroot}/%{_unitdir} install -d %{buildroot}/%{_libdir} cp release/pwrapic/lib/libpwrapi.so %{buildroot}/%{_libdir} install -d %{buildroot}/%{_includedir}/pwrapic cp -r release/pwrapic/inc/* %{buildroot}/%{_includedir}/pwrapic %post -systemctl start pwrapis +%systemd_post pwrapis %preun -systemctl stop pwrapis +%systemd_preun pwrapis + +%postun +%systemd_postun pwrapis %files %{_sbindir}/pwrapis %{_libdir}/libpwrapi.so %dir %{_sysconfdir}/sysconfig/pwrapis %{_sysconfdir}/sysconfig/pwrapis/* -%{_sysconfdir}/systemd/system/pwrapis.service +%{_unitdir}/pwrapis.service -%files -n powerapi-devel -%{_sbindir}/pwrapis -%{_libdir}/libpwrapi.so -%dir %{_sysconfdir}/sysconfig/pwrapis -%{_sysconfdir}/sysconfig/pwrapis/* +%files devel %dir %{_includedir}/pwrapic %{_includedir}/pwrapic/* %changelog +* Thu Oct 02 2025 Funda Wang - 1.2.0-2 +- cleanup spec + * systemd unit file need to be installed into system directory instead + of administrator directory + * prevent devel package conflicts with main package + * set build flags before building + * Mon Aug 18 2025 wangyi - 1.2.0-1 - update hbm interface @@ -77,7 +89,7 @@ systemctl stop pwrapis * Thu Jun 20 2024 heppen - 1.1.0-8 - Bug fix: Delete the unnecessary comma in the configuration file -* Thu Jun 18 2024 heppen - 1.1.0-7 +* Tue Jun 18 2024 heppen - 1.1.0-7 - Bug fix: expand msg buffer, wrong code of check if buffer full. * Wed Jun 12 2024 Zihao Xue - 1.1.0-6 -- Gitee