[packages/chkconfig] - up to 1.5; introduces /lib/systemd/systemd-sysv-install
arekm
arekm at pld-linux.org
Tue Aug 25 13:01:09 CEST 2015
commit 33dcdd90779c09f947031ea7ac82854a61edb56c
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Aug 25 13:01:04 2015 +0200
- up to 1.5; introduces /lib/systemd/systemd-sysv-install
chkconfig-optflags.patch | 37 +++++++++++++++++++++++++++++++++++--
chkconfig.spec | 10 +++++++---
2 files changed, 42 insertions(+), 5 deletions(-)
---
diff --git a/chkconfig.spec b/chkconfig.spec
index 59b664e..99c3697 100644
--- a/chkconfig.spec
+++ b/chkconfig.spec
@@ -9,13 +9,13 @@ Summary(ru.UTF-8): Системная утилита для управления
Summary(tr.UTF-8): Sistem servis bilgilerini sorgular ve yeniler
Summary(uk.UTF-8): Системна утиліта для керування ієрархією /etc/rc.d
Name: chkconfig
-Version: 1.4
+Version: 1.5
Release: 1
Epoch: 2
License: GPL v2
Group: Applications/System
Source0: https://fedorahosted.org/releases/c/h/chkconfig/%{name}-%{version}.tar.bz2
-# Source0-md5: 487dd7b760d6d2154f045797b3eecc00
+# Source0-md5: 0e59a43ef588a7bba5528b10bb59bef2
Patch0: %{name}-add.patch
Patch1: %{name}-noxinet.patch
Patch2: %{name}-rc.d.patch
@@ -164,7 +164,9 @@ Perla; ma być zamiennikiem skryptu update-alternatives z Debiana.
%build
%{__make} \
CC="%{__cc}" \
- OPTFLAGS="%{rpmcflags}"
+ OPTFLAGS="%{rpmcppflags} %{rpmcflags}" \
+ OPTLDFLAGS="%{rpmldflags}" \
+ SYSTEMDDIR=/lib/systemd
%install
rm -rf $RPM_BUILD_ROOT
@@ -172,6 +174,7 @@ install -d $RPM_BUILD_ROOT{/etc/{rc.d/{init,rc{0,1,2,3,4,5,6}}.d,env.d},/sbin}
%{__make} install \
MANDIR=%{_mandir} \
+ SYSTEMDDIR=/lib/systemd \
DESTDIR=$RPM_BUILD_ROOT
%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/bal
@@ -193,6 +196,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
%attr(755,root,root) /sbin/chkconfig
+%attr(755,root,root) /lib/systemd/systemd-sysv-install
%{_mandir}/man8/chkconfig.8*
%config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/*
diff --git a/chkconfig-optflags.patch b/chkconfig-optflags.patch
index 4a77ab0..e227867 100644
--- a/chkconfig-optflags.patch
+++ b/chkconfig-optflags.patch
@@ -5,9 +5,42 @@
TAG = chkconfig-$(VERSION)
-CFLAGS=-g -Wall $(RPM_OPT_FLAGS) -D_GNU_SOURCE
--LDFLAGS+=-g -lselinux -lsepol
+-LDFLAGS+=-g
+CFLAGS=$(OPTFLAGS) -Wall -D_GNU_SOURCE
-+LDFLAGS+=-lselinux -lsepol
++LDFLAGS+=$(OPTLDFLAGS)
MAN=chkconfig.8 ntsysv.8 alternatives.8
PROG=chkconfig
BINDIR = /sbin
+@@ -24,12 +24,12 @@ subdirs:
+ done && test -z "$$fail"
+
+ chkconfig: $(OBJS)
+- $(CC) $(LDFLAGS) -lselinux -lsepol -o chkconfig $(OBJS) -lpopt
++ $(CC) $(LDFLAGS) -o chkconfig $(OBJS) -lpopt -lselinux -lsepol
+
+ alternatives: alternatives.o
+
+ ntsysv: $(NTOBJS)
+- $(CC) $(LDFLAGS) -lselinux -lsepol -o ntsysv $(NTOBJS) -lnewt -lpopt $(LIBMHACK)
++ $(CC) $(LDFLAGS) -o ntsysv $(NTOBJS) -lnewt -lpopt -lselinux -lsepol $(LIBMHACK)
+
+ chkconfig.o: chkconfig.c leveldb.h
+ $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c chkconfig.c
+@@ -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)/$(SYSTEMDDIR) ] || mkdir -p -m 755 $(DESTDIR)/$(SYSTEMDDIR)
+
+ install -m 755 $(PROG) $(DESTDIR)/$(BINDIR)/$(PROG)
+ ln -s ../../../$(BINDIR)/$(PROG) $(DESTDIR)/usr/lib/systemd/systemd-sysv-install
+@@ -59,7 +59,7 @@ install:
+ [ -d $(DESTDIR)/$(SYSTEMDDIR) ] || mkdir -p -m 755 $(DESTDIR)/$(SYSTEMDDIR)
+
+ install -m 755 $(PROG) $(DESTDIR)/$(BINDIR)/$(PROG)
+- ln -s ../../../$(BINDIR)/$(PROG) $(DESTDIR)/usr/lib/systemd/systemd-sysv-install
++ ln -s $(BINDIR)/$(PROG) $(DESTDIR)/$(SYSTEMDDIR)/systemd-sysv-install
+
+ install -m 755 ntsysv $(DESTDIR)/$(SBINDIR)/ntsysv
+ install -m 755 alternatives $(DESTDIR)/$(SBINDIR)/alternatives
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chkconfig.git/commitdiff/33dcdd90779c09f947031ea7ac82854a61edb56c
More information about the pld-cvs-commit
mailing list