From de89958de75b5a26fe6df5cff3405800bc59631e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 9 Nov 2021 05:09:07 -0500 Subject: [PATCH] import chkconfig-1.19.1-1.el8 --- .chkconfig.metadata | 2 +- .gitignore | 2 +- SPECS/chkconfig.spec | 82 ++++++++++++++++++++++++++++++++------------ 3 files changed, 62 insertions(+), 24 deletions(-) diff --git a/.chkconfig.metadata b/.chkconfig.metadata index e11247f..d643903 100644 --- a/.chkconfig.metadata +++ b/.chkconfig.metadata @@ -1 +1 @@ -8f80b21c34e9f267feb34766b92acb0cd2932afa SOURCES/chkconfig-1.13.tar.gz +2f338c18df40376e97bb40a7a4731c754c1599e3 SOURCES/chkconfig-1.19.1.tar.gz diff --git a/.gitignore b/.gitignore index a038d34..c786fb0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/chkconfig-1.13.tar.gz +SOURCES/chkconfig-1.19.1.tar.gz diff --git a/SPECS/chkconfig.spec b/SPECS/chkconfig.spec index 261a27c..5feeab0 100644 --- a/SPECS/chkconfig.spec +++ b/SPECS/chkconfig.spec @@ -1,14 +1,14 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy Name: chkconfig -Version: 1.13 -Release: 2%{?dist} +Version: 1.19.1 +Release: 1%{?dist} License: GPLv2 -Group: System Environment/Base URL: https://github.com/fedora-sysv/chkconfig Source: https://github.com/fedora-sysv/chkconfig/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: newt-devel gettext popt-devel libselinux-devel beakerlib gcc +BuildRequires: newt-devel gettext popt-devel libselinux-devel beakerlib gcc systemd-devel make Conflicts: initscripts <= 5.30-1 + +Provides: /sbin/chkconfig Provides: alternatives = %{version}-%{release} %description @@ -19,7 +19,6 @@ of the drudgery of manually editing the symbolic links. %package -n ntsysv Summary: A tool to set the stop/start of system services in a runlevel -Group: System Environment/Base Requires: chkconfig = %{version}-%{release} %description -n ntsysv @@ -33,14 +32,14 @@ page), ntsysv configures the current runlevel (5 if you're using X). %setup -q %build -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" %{?_smp_mflags} +%make_build RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" %check make check %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} SBINDIR=%{_sbindir} install +%make_install MANDIR=%{_mandir} SBINDIR=%{_sbindir} mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d ln -s rc.d/init.d $RPM_BUILD_ROOT/etc/init.d @@ -52,23 +51,20 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d %find_lang %{name} -%clean -rm -rf $RPM_BUILD_ROOT - %files -f %{name}.lang %defattr(-,root,root) %{!?_licensedir:%global license %%doc} %license COPYING %dir /etc/alternatives -/sbin/chkconfig +%{_sbindir}/chkconfig %{_sbindir}/update-alternatives %{_sbindir}/alternatives -/etc/chkconfig.d -/etc/init.d -/etc/rc.d -/etc/rc.d/init.d -/etc/rc[0-6].d -/etc/rc.d/rc[0-6].d +%{_sysconfdir}/chkconfig.d +%{_sysconfdir}/init.d +%{_sysconfdir}/rc.d +%{_sysconfdir}/rc.d/init.d +%{_sysconfdir}/rc[0-6].d +%{_sysconfdir}/rc.d/rc[0-6].d %dir /var/lib/alternatives %{_mandir}/*/chkconfig* %{_mandir}/*/update-alternatives* @@ -81,6 +77,42 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/*/ntsysv.8* %changelog +* Tue Jul 27 2021 Jan Macku - 1.19.1-1 +- spec: Revert changes introduced in Fedora (#61) + +* Fri Jul 23 2021 Jan Macku - 1.19-1 +- spec: Add Provides /sbin/chkconfig in order to stay backwards compatible (#60) + +* Fri Jul 23 2021 Jan Macku - 1.18-1 +- spec: /sbin/chkconfig -> /usr/sbin/chkconfig (#59) + +* Thu Jul 22 2021 Jan Macku - 1.17-1 +- alternatives: tweak manpage to match the real 'remove' behavior (#58) + +* Thu Jul 15 2021 Jan Macku - 1.16-1 +- alternatives: add --keep-foreign (#57) +- Translations update from Weblate +- ci: Onboard chkconfig to Packit +- zanata: remove zanata related stuff +- Use make macros +- alternatives: use one function for path cleaning +- CI: specify more closely when to run CI +- Add basic CI and README +- spec: sync specfile with Fedora + +* Thu Jan 21 2021 Jan Macku - 1.15-1 +- spec: sync specfile with Fedora +- makefile: Use rpmdev-bumpspec's legacy date option +- Add feature to generate specfile entry, commit and archive + +* Tue Jul 21 2020 Tom Stellard - 1.14-2 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + +* Fri Jul 17 2020 Jan Macku - 1.14-1 +- Fix spelling of SELinux +- Remove hardcoded systemd path + * Fri Apr 17 2020 Jan Macku - 1.13-2 - Package onboarded to gating @@ -92,6 +124,12 @@ rm -rf $RPM_BUILD_ROOT - po: update translations - rebase +* Thu Mar 14 2019 Peter Robinson 1.11-4 +- Split out alternatives into it's own package + +* Mon Oct 08 2018 Lukas Nykryn - 1.11-2 +- add Provides: alternatives + * Mon Sep 10 2018 Lukas Nykryn - 1.11-1 - Add tests for --add/remove-slave and use beakerlib - alternatives: add-slave and remove-slave @@ -365,7 +403,7 @@ rm -rf $RPM_BUILD_ROOT * Fri Jun 4 2004 Bill Nottingham 1.3.11-1 - fix LSB comment parsing (#85678) -* Sat May 29 2004 Bill Nottingham 1.3.10-1 +* Wed May 29 2004 Bill Nottingham 1.3.10-1 - mark alternatives help output for translation (#110526) * Wed Oct 22 2003 Bill Nottingham 1.3.9-1 @@ -435,7 +473,7 @@ rm -rf $RPM_BUILD_ROOT * Sun Jan 27 2002 Erik Troan - reimplemented update-alternatives as just alternatives -* Fri Jan 25 2002 Bill Nottingham +* Thu Jan 25 2002 Bill Nottingham - add in update-alternatives stuff (perl ATM) * Mon Aug 27 2001 Trond Eivind Glomsrød @@ -480,10 +518,10 @@ rm -rf $RPM_BUILD_ROOT * Sun Aug 20 2000 Matt Wilson - new translations -* Wed Aug 16 2000 Nalin Dahyabhai +* Tue Aug 16 2000 Nalin Dahyabhai - don't worry about extra whitespace on chkconfig: lines (#16150) -* Thu Aug 10 2000 Trond Eivind Glomsrød +* Wed Aug 10 2000 Trond Eivind Glomsrød - i18n merge * Wed Jul 26 2000 Matt Wilson