This commit is contained in:
Lukas Nykryn 2017-02-24 15:11:16 +01:00
parent de261d2f00
commit e82efb8130
5 changed files with 8 additions and 60 deletions

1
.gitignore vendored
View File

@ -8,3 +8,4 @@
/chkconfig-1.6.tar.bz2
/chkconfig-1.7.tar.bz2
/chkconfig-1.8.tar.bz2
/chkconfig-1.9.tar.gz

View File

@ -1,25 +0,0 @@
From d790e441d90d29021e1a0706b90657526cb8ddf9 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Mon, 1 Jun 2015 14:11:10 +0200
Subject: [PATCH] Makefile: fix typo
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 4a0cfdb..613d876 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ install:
[ -d $(DESTDIR)/$(MANDIR)/man5 ] || mkdir -p $(DESTDIR)/$(MANDIR)/man5
[ -d $(DESTDIR)/$(ALTDIR) ] || mkdir -p -m 755 $(DESTDIR)/$(ALTDIR)
[ -d $(DESTDIR)/$(ALTDATADIR) ] || mkdir -p -m 755 $(DESTDIR)/$(ALTDATADIR)
- [ -d $(DESTDIR)/usr/lib/systemd) ] || mkdir -p -m 755 $(DESTDIR)/usr/lib/systemd
+ [ -d $(DESTDIR)/usr/lib/systemd ] || mkdir -p -m 755 $(DESTDIR)/usr/lib/systemd
install -m 755 $(PROG) $(DESTDIR)/$(BINDIR)/$(PROG)
ln -s ../../../$(BINDIR)/$(PROG) $(DESTDIR)/usr/lib/systemd/systemd-sysv-install
--
1.8.3.1

View File

@ -1,11 +1,11 @@
Summary: A system tool for maintaining the /etc/rc*.d hierarchy
Name: chkconfig
Version: 1.8
Release: 2%{?dist}
Version: 1.9
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
URL: https://git.fedorahosted.org/git/chkconfig.git
Source: http://fedorahosted.org/releases/c/h/chkconfig/%{name}-%{version}.tar.bz2
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
Conflicts: initscripts <= 5.30-1
@ -80,8 +80,8 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/*/ntsysv.8*
%changelog
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Fri Feb 24 2017 Lukáš Nykrýn <lnykryn@redhat.com> - 1.9-1
- move sources to github
* Wed Jun 29 2016 Lukáš Nykrýn <lnykryn@redhat.com> - 1.8-1
- alternatives: introduce --keep-missing

View File

@ -1,28 +0,0 @@
diff --git a/Makefile b/Makefile
index b6bd711..a3af283 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ VERSION=$(shell awk '/Version:/ { print $$2 }' chkconfig.spec)
TAG = chkconfig-$(VERSION)
CFLAGS=-g -Wall $(RPM_OPT_FLAGS) -D_GNU_SOURCE
-LDFLAGS+=-g -lselinux -lsepol
+LDFLAGS+=-g
MAN=chkconfig.8 ntsysv.8 alternatives.8
PROG=chkconfig
BINDIR = /sbin
@@ -24,12 +24,12 @@ subdirs:
done && test -z "$$fail"
chkconfig: $(OBJS)
- $(CC) $(LDFLAGS) -o chkconfig $(OBJS) -lpopt
+ $(CC) $(LDFLAGS) -lselinux -lsepol -o chkconfig $(OBJS) -lpopt
alternatives: alternatives.o
ntsysv: $(NTOBJS)
- $(CC) $(LDFLAGS) -o ntsysv $(NTOBJS) -lnewt -lpopt $(LIBMHACK)
+ $(CC) $(LDFLAGS) -lselinux -lsepol -o ntsysv $(NTOBJS) -lnewt -lpopt $(LIBMHACK)
chkconfig.o: chkconfig.c leveldb.h
$(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c chkconfig.c

View File

@ -1 +1 @@
5a61d87b60a421bd46de208f0269c227 chkconfig-1.8.tar.bz2
SHA512 (chkconfig-1.9.tar.gz) = 5ba577f0b512239528ca5921ed1e2530ff77549642d2045520711c413f38191973e73668cd652ef06b6d6258ec391e26cfb99e8e7a384faf1e2167c2d62b2c3d