From 93bfdf16aff91d6f2402c5444cd0995a6257c9bb Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Fri, 11 Oct 2024 14:25:43 +0800
Subject: [PATCH] apply patch

(cherry picked from commit 4f8a8d6ea6bbb5f90497e51770fd643817198379)
---
 libcgroup.spec | 59 +++++++++++++++++++++++---------------------------
 libcgroup.yaml |  4 ++--
 2 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/libcgroup.spec b/libcgroup.spec
index 7f8f3ef..8ba31aa 100644
--- a/libcgroup.spec
+++ b/libcgroup.spec
@@ -5,12 +5,14 @@
 Summary: Libcgroup is a library that abstracts the control group file system in Linux
 Name: libcgroup
 Version: 3.1.0
-Release: 4
-License: LGPLv2+
-URL: http://libcg.sourceforge.net/
+Release: 5
+License: LGPL-2.1-or-later
+URL: https://libcg.sourceforge.net/
 Source: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
-Provides: libcgroup-pam libcgroup-tools
-Obsoletes: libcgroup-pam libcgroup-tools
+Provides: libcgroup-pam = %{version}-%{release}
+Provides: libcgroup-tools < %{version}-%{release}
+Obsoletes: libcgroup-pam = %{version}-%{release}
+Obsoletes: libcgroup-tools < %{version}-%{release}
 
 Patch0: config.patch
 
@@ -33,25 +35,23 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 Devel provides API for creating,deleting and modifying cgroup nodes.It allows
 the creation of cgroups' configuration and provides scripts for managing it.
 
-%package help
-Summary: It provides helpful information for libcgroup
-%description help
-It provides helpful information for libcgroup-pam,libcgroup-devel,libcgroup-tools and libcgroup.
+%package_help
 
 %prep
-%setup  -q  -n %{name}-%{version}
+%autosetup -p1 -n %{name}-%{version}
 
 %build
 autoreconf -vif
-%configure --enable-pam-module-dir=%{_libdir}/security --enable-opaque-hierarchy="name=systemd" --disable-daemon
+%configure --enable-pam-module-dir=%{_libdir}/security --enable-opaque-hierarchy="name=systemd" --disable-daemon --disable-static
 %ifarch sw_64
 make
 %else
-make %{?_smp_mflags}
+%make_build
 %endif
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%make_install
+%delete_la
 
 # config
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}
@@ -60,9 +60,7 @@ install -m 644 samples/config/cgsnapshot_denylist.conf $RPM_BUILD_ROOT%{_sysconf
 
 # Only one pam_cgroup.so is needed
 #mv -f $RPM_BUILD_ROOT%{_libdir}/security/pam_cgroup.so $RPM_BUILD_ROOT%{_libdir}/security/pam_cgroup.so
-rm -f $RPM_BUILD_ROOT%{_libdir}/security/pam_cgroup.{,l}a $RPM_BUILD_ROOT%{_libdir}/security/pam_cgroup.so.*
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.{,l}a
+rm -f $RPM_BUILD_ROOT%{_libdir}/security/pam_cgroup.so.*
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libcgroupfortesting.*
 
@@ -70,34 +68,29 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man5/cgred.conf.5*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/cgrules.conf.5*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/cgrulesengd.8*
 
-# unit and sysconfig
-install -d ${RPM_BUILD_ROOT}%{_unitdir}
-
 %pre
 getent group cgred >/dev/null || groupadd -r cgred
 
 %files
-%{!?_licensedir:%global license %%doc}
 %license COPYING
 %{_libdir}/libcgroup.so.*
 %config(noreplace) %{_sysconfdir}/cgsnapshot_denylist.conf
-/usr/bin/cgget
-/usr/bin/cgset
-/usr/bin/cgcreate
-/usr/bin/cgdelete
-/usr/bin/cgsnapshot
-/usr/bin/lscgroup
-/usr/bin/lssubsys
-/usr/sbin/cgconfigparser
-%attr(2755, root, cgred) /usr/bin/cgexec
-%attr(2755, root, cgred) /usr/bin/cgclassify
+%{_bindir}/cgget
+%{_bindir}/cgset
+%{_bindir}/cgcreate
+%{_bindir}/cgdelete
+%{_bindir}/cgsnapshot
+%{_bindir}/lscgroup
+%{_bindir}/lssubsys
+%{_sbindir}/cgconfigparser
+%attr(2755, root, cgred) %{_bindir}/cgexec
+%attr(2755, root, cgred) %{_bindir}/cgclassify
 %attr(0755, root, root) %{_libdir}/security/pam_cgroup.so
 %{_bindir}/cgxget
 %{_bindir}/cgxset
 %{_bindir}/libcgroup_systemd_idle_thread
 
 %files devel
-%{!?_licensedir:%global license %%doc}
 %license COPYING
 %{_libdir}/libcgroup.so
 %{_libdir}/pkgconfig/libcgroup.pc
@@ -105,13 +98,15 @@ getent group cgred >/dev/null || groupadd -r cgred
 %{_includedir}/libcgroup/*.h
 
 %files help
-%license COPYING
 %doc README README_systemd
 %attr(0644, root, root) %{_mandir}/man1/*
 %attr(0644, root, root) %{_mandir}/man5/*
 %attr(0644, root, root) %{_mandir}/man8/*
 
 %changelog
+* Fri Oct 11 2024 Funda Wang <fundawang@yeah.net> - 3.1.0-5
+- apply patch
+
 * Fri Jul 12 2024 liuxu <liuxu156@huawei.com> - 3.1.0-4
 - Type: bugfix
 - Id:NA
diff --git a/libcgroup.yaml b/libcgroup.yaml
index fcb8a30..2ff8279 100644
--- a/libcgroup.yaml
+++ b/libcgroup.yaml
@@ -1,4 +1,4 @@
 version_control: github
 src_repo: libcgroup/libcgroup
-tag_prefix:
-seperator: "."
+tag_prefix: ^v
+separator: "."
-- 
Gitee