diff --git a/.gitignore b/.gitignore index a0ee20f..24cfe34 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /chkconfig-1.3.62.tar.bz2 /chkconfig-1.3.63.tar.bz2 /chkconfig-1.4.tar.bz2 +/chkconfig-1.5.tar.bz2 diff --git a/0001-Makefile-fix-typo.patch b/0001-Makefile-fix-typo.patch new file mode 100644 index 0000000..aed2e65 --- /dev/null +++ b/0001-Makefile-fix-typo.patch @@ -0,0 +1,25 @@ +From d790e441d90d29021e1a0706b90657526cb8ddf9 Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +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 + diff --git a/chkconfig.spec b/chkconfig.spec index 84f02df..c40757e 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -1,6 +1,6 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy Name: chkconfig -Version: 1.4 +Version: 1.5 Release: 1%{?dist} License: GPLv2 Group: System Environment/Base @@ -9,7 +9,7 @@ Source: http://fedorahosted.org/releases/c/h/chkconfig/%{name}-%{version}.tar.bz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: newt-devel gettext popt-devel libselinux-devel Conflicts: initscripts <= 5.30-1 -Patch1: makefile.patch +Patch1: 0001-Makefile-fix-typo.patch %description Chkconfig is a basic system utility. It updates and queries runlevel @@ -72,6 +72,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/*/chkconfig* %{_mandir}/*/update-alternatives* %{_mandir}/*/alternatives* +%{_prefix}/lib/systemd/systemd-sysv-install %files -n ntsysv %defattr(-,root,root) @@ -79,6 +80,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/*/ntsysv.8* %changelog +* Mon Jun 01 2015 Lukáš Nykrýn - 1.5-1 +- add systemd-sysv-install alias +- don't create symlinks if they already exist +- fix wrongly behaving LDFLAGS + * Thu Mar 26 2015 Lukáš Nykrýn - 1.4-1 - ntsysv: show systemd services and sockets - fix combination --type xinetd --list service diff --git a/sources b/sources index 0558c96..e1b35a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -487dd7b760d6d2154f045797b3eecc00 chkconfig-1.4.tar.bz2 +0e59a43ef588a7bba5528b10bb59bef2 chkconfig-1.5.tar.bz2