apply patch

(cherry picked from commit 4f8a8d6ea6bbb5f90497e51770fd643817198379)
This commit is contained in:
Funda Wang 2024-10-11 14:25:43 +08:00 committed by openeuler-sync-bot
parent 25a8455a9a
commit 93bfdf16af
2 changed files with 29 additions and 34 deletions

View File

@ -5,12 +5,14 @@
Summary: Libcgroup is a library that abstracts the control group file system in Linux Summary: Libcgroup is a library that abstracts the control group file system in Linux
Name: libcgroup Name: libcgroup
Version: 3.1.0 Version: 3.1.0
Release: 4 Release: 5
License: LGPLv2+ License: LGPL-2.1-or-later
URL: http://libcg.sourceforge.net/ URL: https://libcg.sourceforge.net/
Source: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz Source: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
Provides: libcgroup-pam libcgroup-tools Provides: libcgroup-pam = %{version}-%{release}
Obsoletes: libcgroup-pam libcgroup-tools Provides: libcgroup-tools < %{version}-%{release}
Obsoletes: libcgroup-pam = %{version}-%{release}
Obsoletes: libcgroup-tools < %{version}-%{release}
Patch0: config.patch Patch0: config.patch
@ -33,25 +35,23 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Devel provides API for creating,deleting and modifying cgroup nodes.It allows Devel provides API for creating,deleting and modifying cgroup nodes.It allows
the creation of cgroups' configuration and provides scripts for managing it. the creation of cgroups' configuration and provides scripts for managing it.
%package help %package_help
Summary: It provides helpful information for libcgroup
%description help
It provides helpful information for libcgroup-pam,libcgroup-devel,libcgroup-tools and libcgroup.
%prep %prep
%setup -q -n %{name}-%{version} %autosetup -p1 -n %{name}-%{version}
%build %build
autoreconf -vif 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 %ifarch sw_64
make make
%else %else
make %{?_smp_mflags} %make_build
%endif %endif
%install %install
make DESTDIR=$RPM_BUILD_ROOT install %make_install
%delete_la
# config # config
install -d ${RPM_BUILD_ROOT}%{_sysconfdir} 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 # 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 #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}/security/pam_cgroup.so.*
rm -f $RPM_BUILD_ROOT%{_libdir}/*.{,l}a
rm -f $RPM_BUILD_ROOT%{_libdir}/libcgroupfortesting.* 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}/man5/cgrules.conf.5*
rm -f $RPM_BUILD_ROOT%{_mandir}/man8/cgrulesengd.8* rm -f $RPM_BUILD_ROOT%{_mandir}/man8/cgrulesengd.8*
# unit and sysconfig
install -d ${RPM_BUILD_ROOT}%{_unitdir}
%pre %pre
getent group cgred >/dev/null || groupadd -r cgred getent group cgred >/dev/null || groupadd -r cgred
%files %files
%{!?_licensedir:%global license %%doc}
%license COPYING %license COPYING
%{_libdir}/libcgroup.so.* %{_libdir}/libcgroup.so.*
%config(noreplace) %{_sysconfdir}/cgsnapshot_denylist.conf %config(noreplace) %{_sysconfdir}/cgsnapshot_denylist.conf
/usr/bin/cgget %{_bindir}/cgget
/usr/bin/cgset %{_bindir}/cgset
/usr/bin/cgcreate %{_bindir}/cgcreate
/usr/bin/cgdelete %{_bindir}/cgdelete
/usr/bin/cgsnapshot %{_bindir}/cgsnapshot
/usr/bin/lscgroup %{_bindir}/lscgroup
/usr/bin/lssubsys %{_bindir}/lssubsys
/usr/sbin/cgconfigparser %{_sbindir}/cgconfigparser
%attr(2755, root, cgred) /usr/bin/cgexec %attr(2755, root, cgred) %{_bindir}/cgexec
%attr(2755, root, cgred) /usr/bin/cgclassify %attr(2755, root, cgred) %{_bindir}/cgclassify
%attr(0755, root, root) %{_libdir}/security/pam_cgroup.so %attr(0755, root, root) %{_libdir}/security/pam_cgroup.so
%{_bindir}/cgxget %{_bindir}/cgxget
%{_bindir}/cgxset %{_bindir}/cgxset
%{_bindir}/libcgroup_systemd_idle_thread %{_bindir}/libcgroup_systemd_idle_thread
%files devel %files devel
%{!?_licensedir:%global license %%doc}
%license COPYING %license COPYING
%{_libdir}/libcgroup.so %{_libdir}/libcgroup.so
%{_libdir}/pkgconfig/libcgroup.pc %{_libdir}/pkgconfig/libcgroup.pc
@ -105,13 +98,15 @@ getent group cgred >/dev/null || groupadd -r cgred
%{_includedir}/libcgroup/*.h %{_includedir}/libcgroup/*.h
%files help %files help
%license COPYING
%doc README README_systemd %doc README README_systemd
%attr(0644, root, root) %{_mandir}/man1/* %attr(0644, root, root) %{_mandir}/man1/*
%attr(0644, root, root) %{_mandir}/man5/* %attr(0644, root, root) %{_mandir}/man5/*
%attr(0644, root, root) %{_mandir}/man8/* %attr(0644, root, root) %{_mandir}/man8/*
%changelog %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 * Fri Jul 12 2024 liuxu <liuxu156@huawei.com> - 3.1.0-4
- Type: bugfix - Type: bugfix
- Id:NA - Id:NA

View File

@ -1,4 +1,4 @@
version_control: github version_control: github
src_repo: libcgroup/libcgroup src_repo: libcgroup/libcgroup
tag_prefix: tag_prefix: ^v
seperator: "." separator: "."