From 06f5a27e95f98e1172e845f8115a4adf00daf11c Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 22 Jan 2021 07:17:38 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/chkconfig.git#384fef43dc66681f257f993bd14c874fd7644e8d --- .gitignore | 1 + chkconfig.spec | 21 +++++++-------------- sources | 2 +- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 008c6d9..88b4104 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /chkconfig-1.10.tar.gz /chkconfig-1.11.tar.gz /chkconfig-1.14.tar.gz +/chkconfig-1.15.tar.gz diff --git a/chkconfig.spec b/chkconfig.spec index 88a2c5e..a91a054 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -1,11 +1,11 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy Name: chkconfig -Version: 1.14 -Release: 3%{?dist} +Version: 1.15 +Release: 1%{?dist} License: GPLv2 URL: https://github.com/fedora-sysv/chkconfig Source: https://github.com/fedora-sysv/chkconfig/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -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 %description @@ -86,8 +86,10 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d %dir /var/lib/alternatives %changelog -* Mon Jul 27 2020 Fedora Release Engineering - 1.14-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +* 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 @@ -105,18 +107,9 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d - po: update translations - rebase -* Tue Jan 28 2020 Fedora Release Engineering - 1.11-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 1.11-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - * Thu Mar 14 2019 Peter Robinson 1.11-4 - Split out alternatives into it's own package -* Thu Jan 31 2019 Fedora Release Engineering - 1.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - * Mon Oct 08 2018 Lukas Nykryn - 1.11-2 - add Provides: alternatives diff --git a/sources b/sources index 5ecae6d..ea91a36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chkconfig-1.14.tar.gz) = 9657815f98859092977f327fa605486235b556250db93b3ecb4ad5f70d81cdbaa08a34896a21015f7afda8562a0961e30327fea00cae60e7ddbc20f92171154d +SHA512 (chkconfig-1.15.tar.gz) = 79a64e095a7abd207b3e0e6c449595e1c13f5eabba416ae0133d842f73e214474f969bd23e13443762224739d281f6f163094129b1f81cc8fb4f674a905eba2b