From 45b66d1cb420a5fedc4b99973b493f03cc474a6592e31e23b4d1e1c839ade982 Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Wed, 15 Nov 2023 13:58:39 +0000 Subject: [PATCH 1/2] Accepting request 1126632 from home:iznogood:factory - Rename libcpupower0 to libcpupower1 following changes in SONAME. - Use ldconfig_scriptlets macro for post(un) handling. OBS-URL: https://build.opensuse.org/request/show/1126632 OBS-URL: https://build.opensuse.org/package/show/hardware/cpupower?expand=0&rev=129 --- cpupower.changes | 6 ++++++ cpupower.spec | 11 +++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/cpupower.changes b/cpupower.changes index 5c4c4c6..e94dd29 100644 --- a/cpupower.changes +++ b/cpupower.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 15 12:57:54 UTC 2023 - Bjørn Lie + +- Rename libcpupower0 to libcpupower1 following changes in SONAME. +- Use ldconfig_scriptlets macro for post(un) handling. + ------------------------------------------------------------------- Sun Mar 5 18:19:36 UTC 2023 - Thomas Renninger diff --git a/cpupower.spec b/cpupower.spec index aceab15..0fda3c0 100644 --- a/cpupower.spec +++ b/cpupower.spec @@ -42,11 +42,11 @@ BuildRequires: pciutils-devel This tool accesses the Linux kernel's processor power subsystems like CPU frequency switching (cpufreq) or CPU sleep states (cpuidle). -%package -n libcpupower0 +%package -n libcpupower1 Summary: Processor power related C-library Group: System/Libraries -%description -n libcpupower0 +%description -n libcpupower1 Contains libcpupower which offers easy functions to access processor frequency, processor idle, processor power hierarchy and other CPU power consumption related information. @@ -54,7 +54,7 @@ and other CPU power consumption related information. %package devel Summary: Include files for libcpupower Group: Development/Languages/C and C++ -Requires: libcpupower0 = %{version} +Requires: libcpupower1 = %{version} %description devel Include files for C/C++ development with libcpupower. @@ -130,8 +130,7 @@ mv %{buildroot}//%{_docdir}/%{name}/cpufreq-bench_script.sh %{buildroot}/%{_docd %find_lang %{name} -%post -n libcpupower0 -p /sbin/ldconfig -%postun -n libcpupower0 -p /sbin/ldconfig +%ldconfig_scriptlets -n libcpupower1 %files %{_mandir}/man1/cpupower*%{?ext_man} @@ -153,7 +152,7 @@ mv %{buildroot}//%{_docdir}/%{name}/cpufreq-bench_script.sh %{buildroot}/%{_docd %{_docdir}/%{name}/examples/cpufreq-bench_script.sh %{_docdir}/%{name}/README-BENCH -%files -n libcpupower0 +%files -n libcpupower1 %{_libdir}/libcpupower*.so.* %files devel From 254583749febe69e71d0ea455047cea5e1ad382dc99dbb97f3fb821d160f1258 Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Mon, 20 Nov 2023 12:41:42 +0000 Subject: [PATCH 2/2] Accepting request 1127698 from home:trenn:branches:hardware - Fix library file version: libcpupower.so.0.0.1 -> libcpupower.so.1.0.1 A cpupower_fix_library_so_name.patch OBS-URL: https://build.opensuse.org/request/show/1127698 OBS-URL: https://build.opensuse.org/package/show/hardware/cpupower?expand=0&rev=130 --- cpupower.changes | 6 ++++++ cpupower.spec | 2 ++ cpupower_fix_library_so_name.patch | 13 +++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 cpupower_fix_library_so_name.patch diff --git a/cpupower.changes b/cpupower.changes index e94dd29..d78ca72 100644 --- a/cpupower.changes +++ b/cpupower.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 20 12:34:46 UTC 2023 - Thomas Renninger + +- Fix library file version: libcpupower.so.0.0.1 -> libcpupower.so.1.0.1 +A cpupower_fix_library_so_name.patch + ------------------------------------------------------------------- Wed Nov 15 12:57:54 UTC 2023 - Bjørn Lie diff --git a/cpupower.spec b/cpupower.spec index 0fda3c0..e807630 100644 --- a/cpupower.spec +++ b/cpupower.spec @@ -29,6 +29,7 @@ Summary: Tools to determine and set CPU Power related Settings License: GPL-2.0-only Group: System/Base URL: https://git.kernel.org/cgit/linux/kernel/git/rafael/linux-pm.git +Patch1: cpupower_fix_library_so_name.patch Patch3: cpupower_exclude_kernel_Makefile.patch Patch6: amd_do_not_show_amount_of_boost_states_if_zero.patch BuildRequires: gettext-tools @@ -98,6 +99,7 @@ There is no reason to install this package. # copy necessary files from kernel-source since we need to modify them (cd %{_prefix}/src/linux ; tar -cf - COPYING CREDITS README tools include scripts Kbuild Makefile arch/*/{include,lib,Makefile} lib) | tar -xf - chmod +x tools/power/cpupower/utils/version-gen.sh +%patch1 -p1 cd %{maindir} %patch3 -p1 %patch6 -p1 diff --git a/cpupower_fix_library_so_name.patch b/cpupower_fix_library_so_name.patch new file mode 100644 index 0000000..7b88328 --- /dev/null +++ b/cpupower_fix_library_so_name.patch @@ -0,0 +1,13 @@ +diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile +index b53753dee02f..0d6782c78a9a 100644 +--- a/tools/power/cpupower/Makefile ++++ b/tools/power/cpupower/Makefile +@@ -52,7 +52,7 @@ DESTDIR ?= + # and _should_ modify the PACKAGE_BUGREPORT definition + + VERSION:= $(shell ./utils/version-gen.sh) +-LIB_MAJ= 0.0.1 ++LIB_MAJ= 1.0.1 + LIB_MIN= 1 + + PACKAGE = cpupower